2017-10-05 13:38:21 +00:00
|
|
|
From 5871fd4ac3a324964d168dbd7803bb6370b9eda0 Mon Sep 17 00:00:00 2001
|
2017-01-08 04:32:04 +00:00
|
|
|
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
|
2017-10-05 13:38:21 +00:00
|
|
|
index e0ae1f7dd..b4318e4f7 100644
|
2017-01-08 04:32:04 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2017-05-14 18:05:01 +00:00
|
|
|
@@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
|
2017-01-08 04:32:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
protected void o(Entity entity) {
|
|
|
|
+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
|
2017-06-08 14:16:51 +00:00
|
|
|
if (entity.bJ() != this) {
|
2017-01-08 04:32:04 +00:00
|
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|
|
|
|
} else {
|
|
|
|
--
|
2017-10-05 13:38:21 +00:00
|
|
|
2.14.2
|
2017-01-08 04:32:04 +00:00
|
|
|
|