yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mace' into 'master'

Browse Source 
Void mace now consumes runes correctly

See merge request 2009scape/2009scape!342
This commit is contained in:
Ceikry
2021-11-29 02:01:52 +00:00
parent 5315121090 7f3ba2c258
commit b1b3ff06dd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+2 -1
View File
@@ -61,4 +61,5 @@
- Animations for passing through Isafdar Dense Forest added - Animations for passing through Isafdar Dense Forest added
- Implement Wire Traps, Leaf Traps, and Stick Traps in Isafdar - Implement Wire Traps, Leaf Traps, and Stick Traps in Isafdar
- Quest point cape/hood no longer unequip on login if wearing QP hood - Quest point cape/hood no longer unequip on login if wearing QP hood
- Random Event Genie lamps now scale exp correctly - Random Event Genie lamps now scale exp correctly
- Void mace now consumes runes correctly
Server/src/main/java/core/game/node/entity/combat/spell/GodSpells.java
+3 -4
View File
@@ -18,6 +18,7 @@ import core.game.node.item.Item;
import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Animation;
import core.game.world.update.flag.context.Graphics; import core.game.world.update.flag.context.Graphics;
import core.plugin.Plugin; import core.plugin.Plugin;
import org.rs09.consts.Items;
/** /**
* Handles the god spells. * Handles the god spells.
@@ -131,10 +132,8 @@ public final class GodSpells extends CombatSpell {
p.sendMessage("You need to cast " + NAMES[index] + " " + (100 - p.getSavedData().getActivityData().getGodCasts()[index]) + " more times inside the Mage Arena."); p.sendMessage("You need to cast " + NAMES[index] + " " + (100 - p.getSavedData().getActivityData().getGodCasts()[index]) + " more times inside the Mage Arena.");
return false; return false;
} }
if (staffId == 8841 && index == 1) {// Void Knight Mace
return true; if (staffId != required && !(index == 1 && staffId == Items.VOID_KNIGHT_MACE_8841)) {
}
if (staffId != required) {
if (message) { if (message) {
((Player) caster).getPacketDispatch().sendMessage("You need to wear a " + ItemDefinition.forId(required).getName() + " to cast this spell."); ((Player) caster).getPacketDispatch().sendMessage("You need to wear a " + ItemDefinition.forId(required).getName() + " to cast this spell.");
} }