aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0200-Don-t-allow-entities-to-ride-themselves-572.patch
blob: 85a14cd9fe4d8bf9716e1be2fb892b91957ccd4a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
From 760288d1cb35ce28612916f1fe13f03a80ea8b73 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 1e295432e..6fcced926 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1917,6 +1917,7 @@ 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.12.2.windows.2