24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
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 8b57a24d4e8469dfbfb4eb2d11ca616e1db98598..26911884384d5e8afd1b43360494b793374f505f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2590,6 +2590,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||
|
|
}
|
||
|
|
|
||
|
|
protected boolean addPassenger(Entity entity) { // CraftBukkit
|
||
|
|
+ // Paper start
|
||
|
|
+ if (entity.level != this.level) {
|
||
|
|
+ throw new IllegalArgumentException("Entity passenger world must match");
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
|
||
|
|
if (entity.getVehicle() != this) {
|
||
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|