Adjusted entity check for Auto/Self trap and SelfWeb

IUDevman · Oct 29, 2020 · 337b311 · 337b311
1 parent b5d7327
commit 337b311
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/src/main/java/com/gamesense/client/module/modules/combat/AutoTrap.java b/src/main/java/com/gamesense/client/module/modules/combat/AutoTrap.java
@@ -13,8 +13,6 @@
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.BlockObsidian;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -191,7 +189,7 @@ else if (trapType.getValue().equalsIgnoreCase("Air")){
             }
 
             for (Entity entity : mc.world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(targetPos))){
-                if (entity instanceof EntityItem || entity instanceof EntityXPOrb){
+                if (entity instanceof EntityPlayer){
                     tryPlacing = false;
                     break;
                 }

diff --git a/src/main/java/com/gamesense/client/module/modules/combat/SelfTrap.java b/src/main/java/com/gamesense/client/module/modules/combat/SelfTrap.java
@@ -11,8 +11,7 @@
 import net.minecraft.block.BlockLiquid;
 import net.minecraft.block.BlockObsidian;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.client.CPacketEntityAction;
@@ -236,7 +235,7 @@ else if (trapType.getValue().equalsIgnoreCase("No Step")){
             }
 
             for (Entity entity : mc.world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(targetPos))){
-                if (entity instanceof EntityItem || entity instanceof EntityXPOrb){
+                if (entity instanceof EntityPlayer){
                     tryPlacing = false;
                     break;
                 }

diff --git a/src/main/java/com/gamesense/client/module/modules/combat/SelfWeb.java b/src/main/java/com/gamesense/client/module/modules/combat/SelfWeb.java
@@ -7,15 +7,11 @@
 import com.gamesense.client.module.ModuleManager;
 import com.gamesense.client.module.modules.gui.ColorMain;
 import net.minecraft.block.*;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.play.client.CPacketEntityAction;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
@@ -185,13 +181,6 @@ public void onUpdate(){
                 tryPlacing = false;
             }
 
-            for (Entity entity : mc.world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(targetPos))){
-                if (entity instanceof EntityItem || entity instanceof EntityXPOrb){
-                    tryPlacing = false;
-                    break;
-                }
-            }
-
             if (tryPlacing && placeBlock(targetPos)){
                 blocksPlaced++;
             }