2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-01-08 05:32:04 +01: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
|
2020-09-11 01:47:58 +02:00
|
|
|
index 2c99bdfed76faedecf8121bd29b3fde4e883fb3a..62f1da9addcfb30ab23dce8c755dcc3e9951e202 100644
|
2017-01-08 05:32:04 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2020-09-11 00:02:39 +02:00
|
|
|
@@ -1946,6 +1946,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2017-01-08 05:32:04 +01:00
|
|
|
}
|
|
|
|
|
2018-10-23 01:16:21 +02:00
|
|
|
protected boolean addPassenger(Entity entity) { // CraftBukkit
|
2017-01-08 05:32:04 +01:00
|
|
|
+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
|
2018-07-17 22:32:05 +02:00
|
|
|
if (entity.getVehicle() != this) {
|
2017-01-08 05:32:04 +01:00
|
|
|
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
|
|
|
|
} else {
|