Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #573 from dedicatedmemers/master

Browse Source 
Don't allow entities to become passengers of themselves
This commit is contained in:
Zach 2017-01-08 16:35:48 -06:00 committed by GitHub
commit be870bc656
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/0204-Don-t-allow-entities-to-ride-themselves-572.patch Normal file
View File

@ -0,0 +1,21 @@
From 4be83edeb2087e34ee74ec25d501b8c286c48b96 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 ea36c53..97d935f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1869,6 +1869,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.9.3 (Apple Git-75)