konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.5.0: added a few safety checks to item buff checking

Browse Source
This commit is contained in:
Evan Debenham
2024-09-05 11:38:30 -04:00
parent 75da7a40e1
commit 15e16828a6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
+2 -2
View File
@@ -84,7 +84,7 @@ public class Artifact extends KindofMisc {
public void activate( Char ch ) { public void activate( Char ch ) {
if (passiveBuff != null){ if (passiveBuff != null){
passiveBuff.detach(); if (passiveBuff.target != null) passiveBuff.detach();
passiveBuff = null; passiveBuff = null;
} }
passiveBuff = passiveBuff(); passiveBuff = passiveBuff();
@@ -96,7 +96,7 @@ public class Artifact extends KindofMisc {
if (super.doUnequip( hero, collect, single )) { if (super.doUnequip( hero, collect, single )) {
if (passiveBuff != null) { if (passiveBuff != null) {
passiveBuff.detach(); if (passiveBuff.target != null) passiveBuff.detach();
passiveBuff = null; passiveBuff = null;
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java
+2 -1
View File
@@ -200,7 +200,8 @@ public class WandOfFireblast extends DamageWand {
@Override @Override
protected int chargesPerCast() { protected int chargesPerCast() {
if (cursed || charger != null && charger.target.buff(WildMagic.WildMagicTracker.class) != null){ if (cursed ||
(charger != null && charger.target == null && charger.target.buff(WildMagic.WildMagicTracker.class) != null)){
return 1; return 1;
} }
//consumes 30% of current charges, rounded up, with a min of 1 and a max of 3. //consumes 30% of current charges, rounded up, with a min of 1 and a max of 3.
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java
+2 -1
View File
@@ -276,7 +276,8 @@ public class WandOfRegrowth extends Wand {
@Override @Override
protected int chargesPerCast() { protected int chargesPerCast() {
if (cursed || charger != null && charger.target.buff(WildMagic.WildMagicTracker.class) != null){ if (cursed ||
(charger != null && charger.target == null && charger.target.buff(WildMagic.WildMagicTracker.class) != null)){
return 1; return 1;
} }
//consumes 30% of current charges, rounded up, with a min of 1 and a max of 3. //consumes 30% of current charges, rounded up, with a min of 1 and a max of 3.