Repackage NMS

By: md_5 <git@md-5.net>
2021-03-16 09:00:00 +11:00
parent 18496e998f
commit 9da047989c
968 changed files with 5448 additions and 5050 deletions
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/AttributeRanged.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/AttributeRanged.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/AttributeRanged.java
-+++ b/net/minecraft/server/AttributeRanged.java
-@@ -20,6 +20,8 @@
+--- a/net/minecraft/world/entity/ai/attributes/AttributeRanged.java
+++ b/net/minecraft/world/entity/ai/attributes/AttributeRanged.java
+@@ -22,6 +22,8 @@
 
     @Override
     public double a(double d0) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/BehaviorAttackTargetForget.java
-+++ b/net/minecraft/server/BehaviorAttackTargetForget.java
-@@ -4,6 +4,12 @@
- import java.util.Optional;
- import java.util.function.Predicate;
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetForget.java
+@@ -10,6 +10,12 @@
+ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+ import net.minecraft.world.entity.ai.memory.MemoryStatus;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.entity.CraftLivingEntity;
@@ -13,7 +13,7 @@
 public class BehaviorAttackTargetForget<E extends EntityInsentient> extends Behavior<E> {
 
     private final Predicate<EntityLiving> b;
-@@ -54,6 +60,17 @@
+@@ -60,6 +66,17 @@
     }
 
     private void d(E e0) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.patch
@@ -1,10 +1,11 @@
--- a/net/minecraft/server/BehaviorAttackTargetSet.java
-+++ b/net/minecraft/server/BehaviorAttackTargetSet.java
-@@ -5,6 +5,12 @@
- import java.util.function.Function;
- import java.util.function.Predicate;
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorAttackTargetSet.java
+@@ -10,6 +10,13 @@
+ import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+ import net.minecraft.world.entity.ai.memory.MemoryStatus;
 
 +// CraftBukkit start
+import net.minecraft.server.level.EntityPlayer;
 +import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
 +import org.bukkit.event.entity.EntityTargetEvent;
@@ -13,7 +14,7 @@
 public class BehaviorAttackTargetSet<E extends EntityInsentient> extends Behavior<E> {
 
     private final Predicate<E> b;
-@@ -33,13 +39,21 @@
+@@ -38,13 +45,21 @@
     }
 
     protected void a(WorldServer worldserver, E e0, long i) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorCareer.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorCareer.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/BehaviorCareer.java
-+++ b/net/minecraft/server/BehaviorCareer.java
-@@ -3,6 +3,12 @@
- import com.google.common.collect.ImmutableMap;
- import java.util.Optional;
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorCareer.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorCareer.java
+@@ -13,6 +13,12 @@
+ import net.minecraft.world.entity.npc.EntityVillager;
+ import net.minecraft.world.entity.npc.VillagerProfession;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.entity.CraftVillager;
@@ -13,7 +13,7 @@
 public class BehaviorCareer extends Behavior<EntityVillager> {
 
     public BehaviorCareer() {
-@@ -19,7 +25,7 @@
+@@ -29,7 +35,7 @@
         GlobalPos globalpos = (GlobalPos) entityvillager.getBehaviorController().getMemory(MemoryModuleType.POTENTIAL_JOB_SITE).get();
 
         entityvillager.getBehaviorController().removeMemory(MemoryModuleType.POTENTIAL_JOB_SITE);
@@ -22,7 +22,7 @@
         worldserver.broadcastEntityEffect(entityvillager, (byte) 14);
         if (entityvillager.getVillagerData().getProfession() == VillagerProfession.NONE) {
             MinecraftServer minecraftserver = worldserver.getMinecraftServer();
-@@ -31,7 +37,14 @@
+@@ -41,7 +47,14 @@
                     return villagerprofession.b() == villageplacetype;
                 }).findFirst();
             }).ifPresent((villagerprofession) -> {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorFarm.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorFarm.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/BehaviorFarm.java
-+++ b/net/minecraft/server/BehaviorFarm.java
-@@ -58,8 +58,8 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorFarm.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorFarm.java
+@@ -78,8 +78,8 @@
 
     protected void a(WorldServer worldserver, EntityVillager entityvillager, long i) {
         if (i > this.c && this.farmBlock != null) {
@@ -11,7 +11,7 @@
         }
 
     }
-@@ -79,7 +79,11 @@
+@@ -99,7 +99,11 @@
                 Block block1 = worldserver.getType(this.farmBlock.down()).getBlock();
 
                 if (block instanceof BlockCrops && ((BlockCrops) block).isRipe(iblockdata)) {
@@ -24,7 +24,7 @@
                 }
 
                 if (iblockdata.isAir() && block1 instanceof BlockSoil && entityvillager.canPlant()) {
-@@ -90,19 +94,28 @@
+@@ -110,19 +114,28 @@
                         boolean flag = false;
 
                         if (!itemstack.isEmpty()) {
@@ -57,7 +57,7 @@
                         }
 
                         if (flag) {
-@@ -121,8 +134,8 @@
+@@ -141,8 +154,8 @@
                     this.farmBlock = this.a(worldserver);
                     if (this.farmBlock != null) {
                         this.c = i + 20L;
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/BehaviorInteractDoor.java
-+++ b/net/minecraft/server/BehaviorInteractDoor.java
-@@ -52,6 +52,13 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.java
+@@ -66,6 +66,13 @@
             BlockDoor blockdoor = (BlockDoor) iblockdata.getBlock();
 
             if (!blockdoor.h(iblockdata)) {
@@ -14,7 +14,7 @@
                 blockdoor.setDoor(worldserver, iblockdata, blockposition, true);
             }
 
-@@ -65,6 +72,13 @@
+@@ -79,6 +86,13 @@
             BlockDoor blockdoor1 = (BlockDoor) iblockdata1.getBlock();
 
             if (!blockdoor1.h(iblockdata1)) {
@@ -28,7 +28,7 @@
                 blockdoor1.setDoor(worldserver, iblockdata1, blockposition1, true);
                 this.c(worldserver, entityliving, blockposition1);
             }
-@@ -113,7 +127,7 @@
+@@ -127,7 +141,7 @@
     private static boolean a(WorldServer worldserver, EntityLiving entityliving, BlockPosition blockposition) {
         BehaviorController<?> behaviorcontroller = entityliving.getBehaviorController();
 
@@ -37,7 +37,7 @@
             return entityliving1.getEntityType() == entityliving.getEntityType();
         }).filter((entityliving1) -> {
             return blockposition.a((IPosition) entityliving1.getPositionVector(), 2.0D);
-@@ -155,7 +169,7 @@
+@@ -169,7 +183,7 @@
         if (behaviorcontroller.getMemory(MemoryModuleType.DOORS_TO_CLOSE).isPresent()) {
             ((Set) behaviorcontroller.getMemory(MemoryModuleType.DOORS_TO_CLOSE).get()).add(globalpos);
         } else {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/BehaviorMakeLove.java
-+++ b/net/minecraft/server/BehaviorMakeLove.java
-@@ -93,6 +93,11 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorMakeLove.java
+@@ -106,6 +106,11 @@
 
     private Optional<EntityVillager> b(WorldServer worldserver, EntityVillager entityvillager, EntityVillager entityvillager1) {
         EntityVillager entityvillager2 = entityvillager.createChild(worldserver, entityvillager1);
@@ -12,7 +12,7 @@
 
         if (entityvillager2 == null) {
             return Optional.empty();
-@@ -101,7 +106,7 @@
+@@ -114,7 +119,7 @@
             entityvillager1.setAgeRaw(6000);
             entityvillager2.setAgeRaw(-24000);
             entityvillager2.setPositionRotation(entityvillager.locX(), entityvillager.locY(), entityvillager.locZ(), 0.0F, 0.0F);
@@ -21,7 +21,7 @@
             worldserver.broadcastEntityEffect(entityvillager2, (byte) 12);
             return Optional.of(entityvillager2);
         }
-@@ -110,6 +115,6 @@
+@@ -123,6 +128,6 @@
     private void a(WorldServer worldserver, EntityVillager entityvillager, BlockPosition blockposition) {
         GlobalPos globalpos = GlobalPos.create(worldserver.getDimensionKey(), blockposition);
 
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorProfession.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorProfession.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/BehaviorProfession.java
-+++ b/net/minecraft/server/BehaviorProfession.java
-@@ -2,6 +2,12 @@
- 
- import com.google.common.collect.ImmutableMap;
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorProfession.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorProfession.java
+@@ -8,6 +8,12 @@
+ import net.minecraft.world.entity.npc.VillagerData;
+ import net.minecraft.world.entity.npc.VillagerProfession;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.entity.CraftVillager;
@@ -13,7 +13,7 @@
 public class BehaviorProfession extends Behavior<EntityVillager> {
 
     public BehaviorProfession() {
-@@ -15,7 +21,14 @@
+@@ -21,7 +27,14 @@
     }
 
     protected void a(WorldServer worldserver, EntityVillager entityvillager, long i) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorUtil.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorUtil.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/BehaviorUtil.java
-+++ b/net/minecraft/server/BehaviorUtil.java
-@@ -38,7 +38,7 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorUtil.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorUtil.java
+@@ -54,7 +54,7 @@
     }
 
     public static void a(EntityLiving entityliving, EntityLiving entityliving1) {
@@ -9,7 +9,7 @@
     }
 
     private static void b(EntityLiving entityliving, EntityLiving entityliving1, float f) {
-@@ -51,18 +51,19 @@
+@@ -67,18 +67,19 @@
     public static void a(EntityLiving entityliving, Entity entity, float f, int i) {
         MemoryTarget memorytarget = new MemoryTarget(new BehaviorPositionEntity(entity, false), f, i);
 
@@ -33,7 +33,7 @@
         double d0 = entityliving.getHeadY() - 0.30000001192092896D;
         EntityItem entityitem = new EntityItem(entityliving.world, entityliving.locX(), d0, entityliving.locZ(), itemstack);
         float f = 0.3F;
-@@ -71,12 +72,19 @@
+@@ -87,12 +88,19 @@
         vec3d1 = vec3d1.d().a(0.30000001192092896D);
         entityitem.setMot(vec3d1);
         entityitem.defaultPickupDelay();
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/BehaviorWorkComposter.java
-+++ b/net/minecraft/server/BehaviorWorkComposter.java
-@@ -11,7 +11,7 @@
+--- a/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+++ b/net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter.java
+@@ -24,7 +24,7 @@
     public BehaviorWorkComposter() {}
 
     @Override
@@ -9,7 +9,7 @@
         Optional<GlobalPos> optional = entityvillager.getBehaviorController().getMemory(MemoryModuleType.JOB_SITE);
 
         if (optional.isPresent()) {
-@@ -30,7 +30,7 @@
+@@ -43,7 +43,7 @@
         BlockPosition blockposition = globalpos.getBlockPosition();
 
         if ((Integer) iblockdata.get(BlockComposter.a) == 8) {
@@ -18,7 +18,7 @@
         }
 
         int i = 20;
-@@ -55,7 +55,7 @@
+@@ -68,7 +68,7 @@
                     i -= k1;
 
                     for (int l1 = 0; l1 < k1; ++l1) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalBreakDoor.java
-+++ b/net/minecraft/server/PathfinderGoalBreakDoor.java
-@@ -66,6 +66,12 @@
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalBreakDoor.java
+@@ -71,6 +71,12 @@
         }
 
         if (this.a == this.f() && this.a(this.entity.world.getDifficulty())) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/PathfinderGoalEatTile.java
-+++ b/net/minecraft/server/PathfinderGoalEatTile.java
-@@ -3,6 +3,10 @@
- import java.util.EnumSet;
- import java.util.function.Predicate;
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalEatTile.java
+@@ -11,6 +11,10 @@
+ import net.minecraft.world.level.block.state.IBlockData;
+ import net.minecraft.world.level.block.state.predicate.BlockStatePredicate;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -11,7 +11,7 @@
 public class PathfinderGoalEatTile extends PathfinderGoal {
 
     private static final Predicate<IBlockData> a = BlockStatePredicate.a(Blocks.GRASS);
-@@ -55,7 +59,8 @@
+@@ -63,7 +67,8 @@
             BlockPosition blockposition = this.b.getChunkCoordinates();
 
             if (PathfinderGoalEatTile.a.test(this.c.getType(blockposition))) {
@@ -21,7 +21,7 @@
                     this.c.b(blockposition, false);
                 }
 
-@@ -64,7 +69,8 @@
+@@ -72,7 +77,8 @@
                 BlockPosition blockposition1 = blockposition.down();
 
                 if (this.c.getType(blockposition1).a(Blocks.GRASS_BLOCK)) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/PathfinderGoalFollowOwner.java
-+++ b/net/minecraft/server/PathfinderGoalFollowOwner.java
-@@ -2,6 +2,12 @@
- 
- import java.util.EnumSet;
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.java
+@@ -15,6 +15,12 @@
+ import net.minecraft.world.level.pathfinder.PathType;
+ import net.minecraft.world.level.pathfinder.PathfinderNormal;
 
 +// CraftBukkit start
 +import org.bukkit.Location;
@@ -13,7 +13,7 @@
 public class PathfinderGoalFollowOwner extends PathfinderGoal {
 
     private final EntityTameableAnimal a;
-@@ -104,7 +110,18 @@
+@@ -117,7 +123,18 @@
         } else if (!this.a(new BlockPosition(i, j, k))) {
             return false;
         } else {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.patch
@@ -1,6 +1,17 @@
--- a/net/minecraft/server/PathfinderGoalPanic.java
-+++ b/net/minecraft/server/PathfinderGoalPanic.java
-@@ -68,6 +68,12 @@
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalPanic.java
+@@ -11,6 +11,10 @@
+ import net.minecraft.world.level.IBlockAccess;
+ import net.minecraft.world.phys.Vec3D;
+ 
+// CraftBukkit start
+import net.minecraft.world.entity.EntityLiving;
+// CraftBukkit end
+
+ public class PathfinderGoalPanic extends PathfinderGoal {
+ 
+     protected final EntityCreature a;
+@@ -76,6 +80,12 @@
 
     @Override
     public boolean b() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/PathfinderGoalRemoveBlock.java
-+++ b/net/minecraft/server/PathfinderGoalRemoveBlock.java
-@@ -3,6 +3,11 @@
- import java.util.Random;
- import javax.annotation.Nullable;
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.java
+@@ -20,6 +20,11 @@
+ import net.minecraft.world.level.chunk.IChunkAccess;
+ import net.minecraft.world.phys.Vec3D;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.block.CraftBlock;
@@ -12,7 +12,7 @@
 public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
 
     private final Block g;
-@@ -81,6 +86,14 @@
+@@ -98,6 +103,14 @@
             }
 
             if (this.i > 60) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalSit.java
-+++ b/net/minecraft/server/PathfinderGoalSit.java
-@@ -19,7 +19,7 @@
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalSit.java
+@@ -22,7 +22,7 @@
     @Override
     public boolean a() {
         if (!this.entity.isTamed()) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalTame.java
-+++ b/net/minecraft/server/PathfinderGoalTame.java
-@@ -57,7 +57,8 @@
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalTame.java
+@@ -62,7 +62,8 @@
                 int i = this.entity.getTemper();
                 int j = this.entity.getMaxDomestication();
 
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.patch
@@ -1,8 +1,8 @@
--- a/net/minecraft/server/PathfinderGoalTempt.java
-+++ b/net/minecraft/server/PathfinderGoalTempt.java
-@@ -2,6 +2,13 @@
- 
- import java.util.EnumSet;
+--- a/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.java
+++ b/net/minecraft/world/entity/ai/goal/PathfinderGoalTempt.java
+@@ -11,6 +11,13 @@
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.item.crafting.RecipeItemStack;
 
 +// CraftBukkit start
 +import org.bukkit.craftbukkit.entity.CraftLivingEntity;
@@ -14,7 +14,7 @@
 public class PathfinderGoalTempt extends PathfinderGoal {
 
     private static final PathfinderTargetCondition c = (new PathfinderTargetCondition()).a(10.0D).a().b().d().c();
-@@ -12,7 +19,7 @@
+@@ -21,7 +28,7 @@
     private double g;
     private double h;
     private double i;
@@ -23,7 +23,7 @@
     private int j;
     private boolean k;
     private final RecipeItemStack l;
-@@ -40,7 +47,17 @@
+@@ -49,7 +56,17 @@
             return false;
         } else {
             this.target = this.a.world.a(PathfinderGoalTempt.c, (EntityLiving) this.a);
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalDefendVillage.java
-+++ b/net/minecraft/server/PathfinderGoalDefendVillage.java
-@@ -49,7 +49,7 @@
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalDefendVillage.java
+@@ -56,7 +56,7 @@
 
     @Override
     public void c() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalHurtByTarget.java
-+++ b/net/minecraft/server/PathfinderGoalHurtByTarget.java
-@@ -53,7 +53,7 @@
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalHurtByTarget.java
+@@ -62,7 +62,7 @@
 
     @Override
     public void c() {
@@ -9,7 +9,7 @@
         this.g = this.e.getGoalTarget();
         this.c = this.e.da();
         this.h = 300;
-@@ -100,6 +100,6 @@
+@@ -109,6 +109,6 @@
     }
 
     protected void a(EntityInsentient entityinsentient, EntityLiving entityliving) {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-+++ b/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java
-@@ -52,7 +52,7 @@
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalNearestAttackableTarget.java
+@@ -59,7 +59,7 @@
 
     @Override
     public void c() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
-+++ b/net/minecraft/server/PathfinderGoalOwnerHurtByTarget.java
-@@ -34,7 +34,7 @@
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtByTarget.java
+@@ -38,7 +38,7 @@
 
     @Override
     public void c() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java
-+++ b/net/minecraft/server/PathfinderGoalOwnerHurtTarget.java
-@@ -34,7 +34,7 @@
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalOwnerHurtTarget.java
+@@ -38,7 +38,7 @@
 
     @Override
     public void c() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.patch
@@ -1,15 +1,15 @@
--- a/net/minecraft/server/PathfinderGoalTarget.java
-+++ b/net/minecraft/server/PathfinderGoalTarget.java
-@@ -2,6 +2,8 @@
- 
- import javax.annotation.Nullable;
+--- a/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.java
+++ b/net/minecraft/world/entity/ai/goal/target/PathfinderGoalTarget.java
+@@ -13,6 +13,8 @@
+ import net.minecraft.world.level.pathfinder.PathPoint;
+ import net.minecraft.world.scores.ScoreboardTeamBase;
 
 +import org.bukkit.event.entity.EntityTargetEvent; // CraftBukkit
 +
 public abstract class PathfinderGoalTarget extends PathfinderGoal {
 
     protected final EntityInsentient e;
-@@ -59,7 +61,7 @@
+@@ -70,7 +72,7 @@
                     if (entityliving instanceof EntityHuman && ((EntityHuman) entityliving).abilities.isInvulnerable) {
                         return false;
                     } else {
@@ -18,7 +18,7 @@
                         return true;
                     }
                 }
-@@ -80,7 +82,7 @@
+@@ -91,7 +93,7 @@
 
     @Override
     public void d() {
--- a/paper-server/nms-patches/net/minecraft/world/entity/ai/village/VillageSiege.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/village/VillageSiege.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/VillageSiege.java
-+++ b/net/minecraft/server/VillageSiege.java
-@@ -108,7 +108,7 @@
+--- a/net/minecraft/world/entity/ai/village/VillageSiege.java
+++ b/net/minecraft/world/entity/ai/village/VillageSiege.java
+@@ -123,7 +123,7 @@
             }
 
             entityzombie.setPositionRotation(vec3d.x, vec3d.y, vec3d.z, worldserver.random.nextFloat() * 360.0F, 0.0F);