summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXor Boole <mcyoung@mit.edu>2015-07-20 16:18:08 +1000
committermd_5 <git@md-5.net>2015-07-20 16:18:08 +1000
commit3e9b5c93d651202731542b45e02eafa23f5dbe57 (patch)
tree8ceca944b70d9a9c909fca80b81746e8795c619f /src
parent87b9f46d72040ca15d8b0bd9008030be962f86ec (diff)
downloadcraftbukkit-3e9b5c93d651202731542b45e02eafa23f5dbe57.tar
craftbukkit-3e9b5c93d651202731542b45e02eafa23f5dbe57.tar.gz
craftbukkit-3e9b5c93d651202731542b45e02eafa23f5dbe57.tar.lz
craftbukkit-3e9b5c93d651202731542b45e02eafa23f5dbe57.tar.xz
craftbukkit-3e9b5c93d651202731542b45e02eafa23f5dbe57.zip
Prevent an Entity from riding itself.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 705381f9..8f5c0587 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;