2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-21 09:02:07 -07:00
Code Issues Projects Releases Packages 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
commit b1b3ff06dd
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -61,4 +61,5 @@
- Animations for passing through Isafdar Dense Forest added
- Implement Wire Traps, Leaf Traps, and Stick Traps in Isafdar
- 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

7
Server/src/main/java/core/game/node/entity/combat/spell/GodSpells.java
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.Graphics;
import core.plugin.Plugin;
import org.rs09.consts.Items;
/**
* 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.");
return false;
}
if (staffId == 8841 && index == 1) {// Void Knight Mace
return true;
}
if (staffId != required) {
if (staffId != required && !(index == 1 && staffId == Items.VOID_KNIGHT_MACE_8841)) {
if (message) {
((Player) caster).getPacketDispatch().sendMessage("You need to wear a " + ItemDefinition.forId(required).getName() + " to cast this spell.");
}