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

From 0000000000000000000000000000000000000000 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 393a2d3ede8e82b33979f18e0cda796bf003f8ef..bd270ea92404c2055c09324988e1ec28109a8815 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1950,6 +1950,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 {
Rebuild all patches using the new rebuild pattern 2020-05-06 09:48:49 +00:00			`From 0000000000000000000000000000000000000000 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 (Bukkit/CraftBukkit/Spigot) 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: 42d5a714 SPIGOT-5899: Hoglins API similar to Piglins 2c1ee10e SPIGOT-5887: ClickType doesn't include off hand swaps 5ff7c7ce SPIGOT-5886: Missing BlockData CraftBukkit Changes: 7560f5f5 SPIGOT-5905: Fix hex colours not being allowed in MOTD d47c47ee SPIGOT-5889: Villager using composter should call EntityChangeBlockEvent 2fe6b4a3 SPIGOT-5899: Hoglins API similar to Piglins e09dbeca SPIGOT-5887: ClickType doesn't include off hand swaps 23aac2a5 SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously 92cbf656 SPIGOT-5884: Tab completions lost on reloadData / minecraft:reload fb4e54ad SPIGOT-5902: PlayerRespawnEvent places player at spawn before event is called aa8f3d5a SPIGOT-5901: Structures are generated in all worlds based on the setting for the main world a0c35937 SPIGOT-5895: PlayerChangedWorldEvent#getFrom is incorrect 89c0a5c3 SPIGOT-5886: Missing BlockData Spigot Changes: 0287a20d SPIGOT-5903: EntityDismountEvent cannot be triggered asynchronously 2020-06-30 05:20:29 +00:00			`index 393a2d3ede8e82b33979f18e0cda796bf003f8ef..bd270ea92404c2055c09324988e1ec28109a8815 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`
Current non compilable status of all patches - THIS IS NOT READY THERE IS STILL NO ETA. GOBLINS WILL EAT YOU. 2020-06-26 01:58:00 +00:00			`@@ -1950,6 +1950,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 {`