testserver/Spigot-Server-Patches/0138-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 8a2093ac5a6d47c795523a1aab87e46f10b1699e..63649936525efd33f50c602f6d723085edb2896e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2031,6 +2031,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`
Implement JellySquid's Entity Collision optimisations patch This patch replaces the vanilla collision code for both block and entity collisions with faster implementations by JellySquid, used originally in her Lithium mod. Optimizes Full Block voxel collisions, and removes streams from Entity collisions Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings) Ported by Co-authored-by: Zoutelande <54509836+Zoutelande@users.noreply.github.com> Touched up by Aikar to keep previous paper optimizations 2020-04-22 15:11:50 +00:00			`index 8a2093ac5a6d47c795523a1aab87e46f10b1699e..63649936525efd33f50c602f6d723085edb2896e 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`
Implement JellySquid's Entity Collision optimisations patch This patch replaces the vanilla collision code for both block and entity collisions with faster implementations by JellySquid, used originally in her Lithium mod. Optimizes Full Block voxel collisions, and removes streams from Entity collisions Original code by JellySquid, licensed under GNU Lesser General Public License v3.0 you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings) Ported by Co-authored-by: Zoutelande <54509836+Zoutelande@users.noreply.github.com> Touched up by Aikar to keep previous paper optimizations 2020-04-22 15:11:50 +00:00			`@@ -2031,6 +2031,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 {`