From 3e9b5c93d651202731542b45e02eafa23f5dbe57 Mon Sep 17 00:00:00 2001 From: Xor Boole Date: Mon, 20 Jul 2015 16:18:08 +1000 Subject: [PATCH] Prevent an Entity from riding itself. --- src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 705381f9f..8f5c0587f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1,5 +1,6 @@ package org.bukkit.craftbukkit.entity; +import com.google.common.base.Preconditions; import java.util.List; import java.util.Set; import java.util.UUID; @@ -301,6 +302,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } public boolean setPassenger(org.bukkit.entity.Entity passenger) { + Preconditions.checkArgument(!this.equals(passenger), "Entity cannot ride itself."); if (passenger instanceof CraftEntity) { ((CraftEntity) passenger).getHandle().mount(getHandle()); return true;