2018-08-27 02:11:49 +08:00
|
|
|
From df9a405ea09f990b466ea4b5482545b799066b32 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
|
2018-08-27 02:11:49 +08:00
|
|
|
index 7f430e590f..a16fbd4579 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
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -2073,6 +2073,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
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
|
2018-07-18 04:32:05 +08:00
|
|
|
if (entity.getVehicle() != this) {
|
2017-01-08 12:32:04 +08:00
|
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|
|
|
|
} else {
|
|
|
|
--
|
2018-08-06 07:46:43 +08:00
|
|
|
2.18.0
|
2017-01-08 12:32:04 +08:00
|
|
|
|