Paper/Spigot-Server-Patches/0139-Don-t-allow-entities-to-ride-themselves-572.patch

22 lines
945 B
Diff
Raw Normal View History

2019-12-12 00:43:22 +01:00
From d9e303b768837901e71e950b680879ca1ec734f4 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
2019-12-12 00:43:22 +01:00
index 63d44401a..1619d9f41 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2019-12-12 00:43:22 +01:00
@@ -2025,6 +2025,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
2018-10-23 01:16:21 +02:00
protected boolean addPassenger(Entity entity) { // CraftBukkit
+ 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) {
throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
} else {
--
2019-12-12 00:43:22 +01:00
2.17.1