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

From 573d1cfd449b7e3c354033b3e6846b4c455874ae 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
index 2ab877c87b..1c8958d15d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     }
 
     protected boolean addPassenger(Entity entity) { // CraftBukkit
+        if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
         if (entity.getVehicle() != this) {
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
-- 
2.25.1
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current 2020-04-02 23:07:06 +02:00			`From 573d1cfd449b7e3c354033b3e6846b4c455874ae Mon Sep 17 00:00:00 2001`
Don't allow entities to ride themselves - #572 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`
Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded() 2020-04-02 06:43:11 +02:00			`index 2ab877c87b..1c8958d15d 100644`
Don't allow entities to ride themselves - #572 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`
Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded() 2020-04-02 06:43:11 +02:00			`@@ -2029,6 +2029,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke`
Don't allow entities to ride themselves - #572 2017-01-08 05:32:04 +01:00			`}`

Update for Minecraft 1.13.2 2018-10-23 01:16:21 +02:00			`protected boolean addPassenger(Entity entity) { // CraftBukkit`
Don't allow entities to ride themselves - #572 2017-01-08 05:32:04 +01:00			`+ if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572`
NOT WORKING! Even even more patches! 2018-07-17 22:32:05 +02:00			`if (entity.getVehicle() != this) {`
Don't allow entities to ride themselves - #572 2017-01-08 05:32:04 +01:00			`throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");`
			`} else {`
			`--`
Improve entity.getCurrentChunk() and use it for entity.isChunkLoaded() 2020-04-02 06:43:11 +02:00			`2.25.1`
Don't allow entities to ride themselves - #572 2017-01-08 05:32:04 +01:00