From 62bdbc81e4354e4bbcf23c20c978b67aaf3d2909 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Sun, 15 Mar 2020 19:15:28 +0000 Subject: [PATCH] Prevent players from picking up items when possessing and prevent players from possessing whilst sneaking, fixes #376 --- .../electroblob/wizardry/spell/Possession.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/electroblob/wizardry/spell/Possession.java b/src/main/java/electroblob/wizardry/spell/Possession.java index d04bd5f7..e464b173 100644 --- a/src/main/java/electroblob/wizardry/spell/Possession.java +++ b/src/main/java/electroblob/wizardry/spell/Possession.java @@ -201,6 +201,8 @@ public class Possession extends SpellRay { */ public boolean possess(EntityPlayer possessor, EntityLiving target, int duration){ + if(possessor.isSneaking()) return false; + if(WizardData.get(possessor) != null){ WizardData.get(possessor).setVariable(POSSESSEE_KEY, target); @@ -683,11 +685,13 @@ public class Possession extends SpellRay { if(possessee != null){ - if(possessee.canPickUpLoot() && possessee.getHeldItemMainhand().isEmpty()){ - possessee.setHeldItem(EnumHand.MAIN_HAND, event.getItem().getItem()); - }else{ - event.setCanceled(true); - } + event.setCanceled(true); + +// if(possessee.canPickUpLoot() && possessee.getHeldItemMainhand().isEmpty()){ +// possessee.setHeldItem(EnumHand.MAIN_HAND, event.getItem().getItem()); +// }else{ +// event.setCanceled(true); +// } } }