From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Spottedleaf 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 353cf7574aea63413899a4b6d5edf43cc675c1da..0027f9ae4b184f7718778d7fc7634c05d323af26 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2668,7 +2668,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean startRiding(Entity entity, boolean force) { - if (entity == this.vehicle) { + if (entity == this.vehicle || entity.level != this.level) { // Paper - check level return false; } else if (!entity.couldAcceptPassenger()) { return false;