aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-05-26 12:51:15 -0700
committerGitHub <[email protected]>2024-05-26 12:51:15 -0700
commit9774a52d110f29e4be956d1aad7bb4c99b50d21d (patch)
tree87b4d46a37670e8fadfae8bc4924fcf633616457 /patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
parentca50b87947e0aca6017a7d4b242d892b930ae2c2 (diff)
downloadPaper-9774a52d110f29e4be956d1aad7bb4c99b50d21d.tar.gz
Paper-9774a52d110f29e4be956d1aad7bb4c99b50d21d.zip
fix and cleanup loot table patches (#10100)
* fix and cleanup loot table patches * fixes
Diffstat (limited to 'patches/server/0484-Collision-option-for-requiring-a-player-participant.patch')
-rw-r--r--patches/server/0484-Collision-option-for-requiring-a-player-participant.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
index 0f66837ab0..612a957bf2 100644
--- a/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Collision option for requiring a player participant
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 67dd20b6fae2ee39eaae3286eba7b485a6dd41cc..eb5cc58e5b53407de5d2a0ddcbbfbc7cdd3bb072 100644
+index 77f24eb88af8fde66ef2198bb7673c71de42800f..d8658bca3964c931be9dbbfc25de03f0d2e4b6c5 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1872,6 +1872,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1871,6 +1871,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
public void push(Entity entity) {
if (!this.isPassengerOfSameVehicle(entity)) {
if (!entity.noPhysics && !this.noPhysics) {