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

From 94def123ad430b43c241982b2aa937372df72db3 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 653bc6cd69..f3422a097b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2073,6 +2073,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     }
 
     protected boolean o(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.18.0
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: 3e2858f6 SPIGOT-4352: MoistureChangeEvent 5466e281 Add BlockDispenseArmorEvent CraftBukkit Changes: 3123a069 SPIGOT-4352: MoistureChangeEvent 226db0ea Add BlockDispenseArmorEvent cd367fa4 Fix bad thread safety in ChunkRegionLoader 3f5ca5f2 SPIGOT-4355: Improve cancelling VehicleEnterEvent Spigot Changes: 145a37ae Rebuild patches 3f2423cc Rebuild patches 2018-09-09 21:26:56 +02:00			`From 94def123ad430b43c241982b2aa937372df72db3 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`
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: 3e2858f6 SPIGOT-4352: MoistureChangeEvent 5466e281 Add BlockDispenseArmorEvent CraftBukkit Changes: 3123a069 SPIGOT-4352: MoistureChangeEvent 226db0ea Add BlockDispenseArmorEvent cd367fa4 Fix bad thread safety in ChunkRegionLoader 3f5ca5f2 SPIGOT-4355: Improve cancelling VehicleEnterEvent Spigot Changes: 145a37ae Rebuild patches 3f2423cc Rebuild patches 2018-09-09 21:26:56 +02:00			`index 653bc6cd69..f3422a097b 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`
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1 2018-08-26 20:11:49 +02:00			`@@ -2073,6 +2073,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			`}`

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: 3e2858f6 SPIGOT-4352: MoistureChangeEvent 5466e281 Add BlockDispenseArmorEvent CraftBukkit Changes: 3123a069 SPIGOT-4352: MoistureChangeEvent 226db0ea Add BlockDispenseArmorEvent cd367fa4 Fix bad thread safety in ChunkRegionLoader 3f5ca5f2 SPIGOT-4355: Improve cancelling VehicleEnterEvent Spigot Changes: 145a37ae Rebuild patches 3f2423cc Rebuild patches 2018-09-09 21:26:56 +02:00			`protected boolean o(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 {`
			`--`
[Auto] Update Upstream Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes: a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations 195f071e SPIGOT-4219: Event for PigZombies angering. 5e3082c7 SPIGOT-4230: Improve legacy block types 2018-08-06 01:46:43 +02:00			`2.18.0`
Don't allow entities to ride themselves - #572 2017-01-08 05:32:04 +01:00