2017-05-27 11:46:27 +08:00
|
|
|
From 1fbff2336b454ee0330c1cd5a380f3b4bf76b2cf Mon Sep 17 00:00:00 2001
|
2017-01-08 12:32:04 +08: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-05-27 11:46:27 +08:00
|
|
|
index 0a3d1969a..127eaf1f6 100644
|
2017-01-08 12:32:04 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2017-05-15 02:05:01 +08:00
|
|
|
@@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
|
2017-01-08 12:32:04 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
protected void o(Entity entity) {
|
|
|
|
+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
|
2017-05-15 02:05:01 +08:00
|
|
|
if (entity.bH() != this) {
|
2017-01-08 12:32:04 +08:00
|
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|
|
|
|
} else {
|
|
|
|
--
|
2017-05-21 12:41:39 +08:00
|
|
|
2.13.0.windows.1
|
2017-01-08 12:32:04 +08:00
|
|
|
|