aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch')
-rw-r--r--patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
new file mode 100644
index 0000000000..1eae2e3629
--- /dev/null
+++ b/patches/server/0703-Ensure-entity-passenger-world-matches-ridden-entity.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Thu, 31 Mar 2022 05:11:37 -0700
+Subject: [PATCH] Ensure entity passenger world matches ridden entity
+
+Bad plugins doing this would cause some obvious problems...
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index ce21885281a2bca8f363ebc6423ca65df7c13c6d..d689f02150fa55ffcfb03adb5955f190ffdcc0de 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -2611,7 +2611,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ }
+
+ public boolean startRiding(Entity entity, boolean force) {
+- if (entity == this.vehicle) {
++ if (entity == this.vehicle || entity.level != this.level) { // Paper - Ensure entity passenger world matches ridden entity (bad plugins)
+ return false;
+ } else if (!entity.couldAcceptPassenger()) {
+ return false;