aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0134-Cap-Entity-Collisions.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0134-Cap-Entity-Collisions.patch')
-rw-r--r--patches/server/0134-Cap-Entity-Collisions.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0134-Cap-Entity-Collisions.patch b/patches/server/0134-Cap-Entity-Collisions.patch
index 9fc626bec9..ccec87a847 100644
--- a/patches/server/0134-Cap-Entity-Collisions.patch
+++ b/patches/server/0134-Cap-Entity-Collisions.patch
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
You can set this to 0 to disable collisions.
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f7a8c947ef639d0d9cf8e527f8a0072432cba0c5..a676fa481ad3e3ac60cf5ba9d86acd61bea329ca 100644
+index 2d6d393ccdb6ed3aadc1e00a7a1a8dcb78277771..55f1886761c7a528f0f1e371de546aff7707e60b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -379,6 +379,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -24,10 +24,10 @@ index f7a8c947ef639d0d9cf8e527f8a0072432cba0c5..a676fa481ad3e3ac60cf5ba9d86acd61
private org.bukkit.util.Vector origin;
@javax.annotation.Nullable
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9f6629189a126c12a2d45098e12f41d8e45147a4..841149ffcdb2228fac3ac2bdc56c02ed26f219f6 100644
+index 45b76070d6a178ffb5cd378cbeb12342eab4f360..e711c02279ff48e76038a6281bbe8060e34d900b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3264,8 +3264,11 @@ public abstract class LivingEntity extends Entity {
+@@ -3286,8 +3286,11 @@ public abstract class LivingEntity extends Entity {
}
}