From f79ab295a53649df6a85348bfa4226e663d2067b Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Wed, 16 Jun 2021 00:59:41 +0200 Subject: [PATCH] one missed AT --- build-data/paper.at | 1 + .../server/0361-Entity-Activation-Range-2.0.patch | 13 ------------- patches/server/0428-Implement-Mob-Goal-API.patch | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/build-data/paper.at b/build-data/paper.at index 98e075900..76c0fda45 100644 --- a/build-data/paper.at +++ b/build-data/paper.at @@ -96,6 +96,7 @@ public net.minecraft.server.network.ServerLoginPacketListenerImpl$State # Entity Activation Range 2.0 public net.minecraft.world.entity.Entity isInsidePortal public net.minecraft.world.entity.Mob leashHolder +public net.minecraft.world.entity.LivingEntity jumping # No-Tick view distance public net.minecraft.server.level.ChunkHolder broadcast(Lnet/minecraft/network/protocol/Packet;Z)V diff --git a/patches/server/0361-Entity-Activation-Range-2.0.patch b/patches/server/0361-Entity-Activation-Range-2.0.patch index 5663d95c4..8b80bb91a 100644 --- a/patches/server/0361-Entity-Activation-Range-2.0.patch +++ b/patches/server/0361-Entity-Activation-Range-2.0.patch @@ -157,19 +157,6 @@ index b2275c1171f52cbdf283d210c6488e974fa07d98..4ea2bea8641e08bb0350582efc8b4329 movement = this.maybeBackOffFromEdge(movement, movementType); Vec3 vec3d1 = this.collide(movement); -diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5f73418035ac1226c6b655b654367ff9cf9f0841..02609533a9c8ae70d50fa81bd0e42af6aca2ee62 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -219,7 +219,7 @@ public abstract class LivingEntity extends Entity { - protected float rotOffs; - protected int deathScore; - public float lastHurt; -- protected boolean jumping; -+ public boolean jumping; // Paper protected -> public - public float xxa; - public float yya; - public float zza; diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java index 9c208d24d6f84e8818c0a7b88cdcb7c2fd703f91..623fd2220007eec7a8e799a647e7c657aae5ee6d 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java diff --git a/patches/server/0428-Implement-Mob-Goal-API.patch b/patches/server/0428-Implement-Mob-Goal-API.patch index 7d851a72c..93d56e3d7 100644 --- a/patches/server/0428-Implement-Mob-Goal-API.patch +++ b/patches/server/0428-Implement-Mob-Goal-API.patch @@ -941,7 +941,7 @@ index 130ab05393a7136020e06ec199256a031ba66091..8dd93620a770855450ed222dad6572e2 } diff --git a/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java new file mode 100644 -index 0000000000000000000000000000000000000000..b2d510459bcf90a3611f3d91dae4ccc3d29b4079 +index 0000000000000000000000000000000000000000..35d6affcedcf324a7d2a8f8f7c0a966cef47631e --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/entity/ai/VanillaMobGoalTest.java @@ -0,0 +1,105 @@