From 3195cf650e12b867fef6c3f6a9dcbf337a14144a Mon Sep 17 00:00:00 2001 From: 70000hp <105080577+70000hp@users.noreply.github.com> Date: Sun, 9 Jun 2024 18:03:39 -0400 Subject: [PATCH] anti piracy feature begone --- .../hbm/entity/item/EntityDeliveryDrone.java | 27 +++++++++++++++++++ .../hbm/entity/item/EntityRequestDrone.java | 13 +++++++++ 2 files changed, 40 insertions(+) diff --git a/src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java b/src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java index 8d1f1a01a..26a906115 100644 --- a/src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java +++ b/src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java @@ -4,8 +4,11 @@ import com.hbm.entity.logic.IChunkLoader; import com.hbm.inventory.FluidStack; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; +import com.hbm.items.ModItems; +import com.hbm.items.tool.ItemDrone; import com.hbm.main.MainRegistry; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -29,6 +32,30 @@ public class EntityDeliveryDrone extends EntityDroneBase implements IInventory, super(world); } + @Override + public boolean hitByEntity(Entity attacker) { + + if(attacker instanceof EntityPlayer && !worldObj.isRemote) { + this.setDead(); + for (ItemStack stack : slots) { + if(stack != null) + this.entityDropItem(stack, 1F); + } + int meta = 0; + + //whether it is an express drone + if(this.dataWatcher.getWatchableObjectByte(11) == 1) + meta = 2; + + if(chunkLoading) + meta += 1; + + this.entityDropItem(new ItemStack(ModItems.drone, 1, meta), 1F); + } + + return false; + } + @Override protected void entityInit() { super.entityInit(); diff --git a/src/main/java/com/hbm/entity/item/EntityRequestDrone.java b/src/main/java/com/hbm/entity/item/EntityRequestDrone.java index 15922bd52..c451f6788 100644 --- a/src/main/java/com/hbm/entity/item/EntityRequestDrone.java +++ b/src/main/java/com/hbm/entity/item/EntityRequestDrone.java @@ -13,6 +13,8 @@ import com.hbm.tileentity.network.TileEntityDroneProvider; import com.hbm.tileentity.network.TileEntityDroneRequester; import com.hbm.util.fauxpointtwelve.BlockPos; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -38,7 +40,18 @@ public class EntityRequestDrone extends EntityDroneBase { this.targetZ = z; } + @Override + public boolean hitByEntity(Entity attacker) { + if(attacker instanceof EntityPlayer && !worldObj.isRemote) { + this.setDead(); + if(heldItem != null) + this.entityDropItem(heldItem, 1F); + this.entityDropItem(new ItemStack(ModItems.drone, 1, EnumDroneType.REQUEST.ordinal()), 1F); + } + + return false; + } public EntityRequestDrone(World world) { super(world); }