mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 20:21:51 +01:00
21 lines
1 KiB
Diff
21 lines
1 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 5aed3f18ef7464e1fa6f6ee69fad72d524356af0..32d7f615982f73dd985b919aae071d426ad08ca9 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2778,7 +2778,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;
|