22 lines
896 B
Diff
22 lines
896 B
Diff
|
From 4be83edeb2087e34ee74ec25d501b8c286c48b96 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
|
||
|
|
index ea36c53..97d935f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -1869,6 +1869,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
|
||
|
|
if (entity.bB() != this) {
|
||
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|
||
|
|
} else {
|
||
|
|
--
|
||
|
|
2.9.3 (Apple Git-75)
|
||
|
|
|