LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.5: fixed the mage's staff still charging after being thrown

Browse Source
This commit is contained in:
Evan Debenham 2016-03-07 00:21:59 -05:00
parent bc463a0a7c
commit f8efaa6d5d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/shatteredpixel/shatteredpixeldungeon/items/EquipableItem.java
View File

@ -20,13 +20,13 @@
*/ */
package com.shatteredpixel.shatteredpixeldungeon.items; package com.shatteredpixel.shatteredpixeldungeon.items;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
import java.util.ArrayList; import java.util.ArrayList;
@ -107,11 +107,11 @@ public abstract class EquipableItem extends Item {
hero.spend( time2equip( hero ) ); hero.spend( time2equip( hero ) );
} }
if (collect && !collect( hero.belongings.backpack )) { if (!collect || !collect( hero.belongings.backpack )) {
onDetach(); onDetach();
Dungeon.quickslot.clearItem(this); Dungeon.quickslot.clearItem(this);
updateQuickslot(); updateQuickslot();
Dungeon.level.drop( this, hero.pos ); if (collect) Dungeon.level.drop( this, hero.pos );
} }
return true; return true;