2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-20 05:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity

Fixed telegrab through walls

Browse source
This commit is contained in:
Player Name 2025-02-01 14:00:59 +00:00 • committed by Ryan
parent fcbea5acdc
commit c3929cf06c
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Server/src/main/content/minigame/mta/TelekineticGrabSpell.java
View file

@ -4,6 +4,7 @@ import content.minigame.mta.impl.TelekineticZone;
import core.game.interaction.SpecialGroundItems; import core.game.interaction.SpecialGroundItems;
import core.game.node.Node; import core.game.node.Node;
import core.game.node.entity.Entity; import core.game.node.entity.Entity;
import core.game.node.entity.combat.CombatSwingHandler;
import core.game.node.entity.combat.spell.SpellType; import core.game.node.entity.combat.spell.SpellType;
import core.game.node.entity.combat.spell.SpellBlocks; import core.game.node.entity.combat.spell.SpellBlocks;
import core.game.node.entity.impl.Projectile; import core.game.node.entity.impl.Projectile;
@ -24,7 +25,7 @@ import core.game.global.action.PickupHandler;
import core.game.world.GameWorld; import core.game.world.GameWorld;
import org.rs09.consts.Sounds; import org.rs09.consts.Sounds;
import static core.api.ContentAPIKt.playAudio; import static core.api.ContentAPIKt.*;
/** /**
* Represents the telekenitic grab spell. * Represents the telekenitic grab spell.
@ -176,8 +177,12 @@ public final class TelekineticGrabSpell extends MagicSpell {
} }
if (entity instanceof Player) { if (entity instanceof Player) {
final Player player = (Player) entity; final Player player = (Player) entity;
if (!player.getInventory().hasSpaceFor(((Item) item))) { if (!CombatSwingHandler.isProjectileClipped(player, item, false)) {
player.getPacketDispatch().sendMessage("You don't have enough inventory space."); sendMessage(player, "I can't reach that."); //TODO authentic message?
return false;
}
if (!hasSpaceFor(player, item)) {
sendMessage(player, "You don't have enough inventory space.");
return false; return false;
} }
if (!PickupHandler.canTake(player, item, 1)) { if (!PickupHandler.canTake(player, item, 1)) {