mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 19:00:16 +01:00
19 lines
1019 B
Diff
19 lines
1019 B
Diff
|
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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index d314cdd9341e6aa5748a5b1afdd9569bec956c74..00e79363b3f961111595c50758332f6c1c1b31bb 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -2046,6 +2046,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
||
|
|
}
|
||
|
|
|
||
|
|
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 {
|