papermc/Spigot-Server-Patches/0172-Don-t-allow-entities-to-ride-themselves-572.patch

22 lines
918 B
Diff
Raw Normal View History

2018-07-30 02:16:15 +00:00
From 898566e459ff4fc3346be2686d57e9a3fde2ad3b Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Sun, 8 Jan 2017 04:31:36 +0000
Subject: [PATCH] Don't allow entities to ride themselves - #572
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2018-07-30 02:16:15 +00:00
index dca8dd55a4..a8f321640c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2018-07-30 02:16:15 +00:00
@@ -2068,6 +2068,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
protected void o(Entity entity) {
+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
2018-07-17 20:32:05 +00:00
if (entity.getVehicle() != this) {
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
--
2018-07-21 20:43:00 +00:00
2.18.0