From 519d60b74704f1a84bb4818d03cecff4cc07df7b Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Sun, 8 Jan 2017 04:32:04 +0000
Subject: [PATCH] Don't allow entities to ride themselves - #572

---
 ...llow-entities-to-ride-themselves-572.patch | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch

diff --git a/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
new file mode 100644
index 0000000000..4f28264599
--- /dev/null
+++ b/Spigot-Server-Patches/Don-t-allow-entities-to-ride-themselves-572.patch
@@ -0,0 +1,21 @@
+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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
+     }
+ 
+     protected void o(Entity entity) {
++        if (entity == this) throw new IllegalArgumentException("Entities cannot become a passenger of themselves"); // Paper - issue 572
+         if (entity.bB() != this) {
+             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
+         } else {
+-- 
+2.9.3 (Apple Git-75)
+