Paper/Spigot-Server-Patches/0193-Don-t-allow-entities-to-ride-themselves-572.patch

22 lines
884 B
Diff
Raw Normal View History

2018-01-11 06:31:19 +01:00
From 124cae47c946fa9087ef435e5f3f81df34f91e83 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-01-11 06:31:19 +01:00
index 9080006e..a6ffe144 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2017-11-08 17:13:57 +01:00
@@ -1938,6 +1938,7 @@ public abstract class Entity implements ICommandListener {
}
protected void o(Entity entity) {
+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
2017-06-08 16:16:51 +02:00
if (entity.bJ() != this) {
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
--
2017-11-08 17:13:57 +01:00
2.14.3