fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent players from picking up items when possessing and prevent players from possessing whilst sneaking, fixes #376

Browse Source
This commit is contained in:
Electroblob77
2020-03-15 19:15:28 +00:00
parent 3a571fd239
commit 62bdbc81e4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/Possession.java
+9 -5
View File
@@ -201,6 +201,8 @@ public class Possession extends SpellRay {
*/ */
public boolean possess(EntityPlayer possessor, EntityLiving target, int duration){ public boolean possess(EntityPlayer possessor, EntityLiving target, int duration){
if(possessor.isSneaking()) return false;
if(WizardData.get(possessor) != null){ if(WizardData.get(possessor) != null){
WizardData.get(possessor).setVariable(POSSESSEE_KEY, target); WizardData.get(possessor).setVariable(POSSESSEE_KEY, target);
@@ -683,11 +685,13 @@ public class Possession extends SpellRay {
if(possessee != null){ if(possessee != null){
if(possessee.canPickUpLoot() && possessee.getHeldItemMainhand().isEmpty()){ event.setCanceled(true);
possessee.setHeldItem(EnumHand.MAIN_HAND, event.getItem().getItem());
}else{ // if(possessee.canPickUpLoot() && possessee.getHeldItemMainhand().isEmpty()){
event.setCanceled(true); // possessee.setHeldItem(EnumHand.MAIN_HAND, event.getItem().getItem());
} // }else{
// event.setCanceled(true);
// }
} }
} }