testserver/Spigot-Server-Patches/0145-Don-t-allow-entities-t...

From 1a5dc4c2056ae3efb29c34a563aaf1fb3f60bf29 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 c5576e0325..e1ad87f2fe 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1993,6 +1993,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.21.0
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 15:36:57 +00:00			`From 1a5dc4c2056ae3efb29c34a563aaf1fb3f60bf29 Mon Sep 17 00:00:00 2001`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00: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`
Updated Upstream (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 CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 15:36:57 +00:00			`index c5576e0325..e1ad87f2fe 100644`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00:00			`--- a/src/main/java/net/minecraft/server/Entity.java`
			`+++ b/src/main/java/net/minecraft/server/Entity.java`
Updated Upstream (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 CraftBukkit Changes: 17da3420 Fix reading custom persistent entity data 83783357 SPIGOT-4980: Shields will not be put on cooldown when hit with an axe 8d0f3722 SPIGOT-4752: Fixed inconsistency between isChunkLoaded and chunk load/unload events 3f9f31c3 SPIGOT-4982: Armor disappearing while breaking the armor stand 2019-05-26 01:56:30 +00:00			`@@ -1993,6 +1993,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00:00			`}`

Update for Minecraft 1.13.2 2018-10-22 23:16:21 +00:00			`protected boolean addPassenger(Entity entity) { // CraftBukkit`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00: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 20:32:05 +00:00			`if (entity.getVehicle() != this) {`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00:00			`throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");`
			`} else {`
			`--`
Default nether void damage to off and allow that 2019-04-05 05:27:37 +00:00			`2.21.0`
Don't allow entities to ride themselves - #572 2017-01-08 04:32:04 +00:00