Stop allay picking up loot if protected

CitizensDev · Jun 17, 2022 · 552d254 · 552d254
1 parent a64ad43
commit 552d254
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/AllayController.java
@@ -61,6 +61,13 @@ public EntityAllayNPC(EntityType<? extends Allay> types, Level level, NPC npc) {
             }
         }
 
+        @Override
+        public boolean canPickUpLoot() {
+            if (npc != null && npc.isProtected())
+                return false;
+            return super.canPickUpLoot();
+        }
+
         @Override
         protected boolean canRide(Entity entity) {
             if (npc != null && (entity instanceof Boat || entity instanceof AbstractMinecart)) {

diff --git a/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java b/v1_19_R1/src/main/java/net/citizensnpcs/nms/v1_19_R1/entity/EntityHumanNPC.java
@@ -92,7 +92,6 @@ public EntityHumanNPC(MinecraftServer minecraftServer, ServerLevel world, GamePr
             ProfilePublicKey ppk, NPC npc) {
         super(minecraftServer, world, gameProfile, ppk);
         this.npc = (CitizensNPC) npc;
-
         if (npc != null) {
             skinTracker = new SkinPacketTracker(this);
             try {