Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-17 17:31:06 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-2640: API for multiple passengers per entity

Browse Source
This commit is contained in:
md_5 2017-01-04 10:53:07 +11:00
parent ce89845fda
commit 7e19325845
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@ -1,6 +1,8 @@
package org.bukkit.craftbukkit.entity;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.util.List;
import java.util.Set;
import java.util.UUID;
@ -331,13 +333,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Preconditions.checkArgument(!this.equals(passenger), "Entity cannot ride itself.");
if (passenger instanceof CraftEntity) {
eject();
((CraftEntity) passenger).getHandle().startRiding(getHandle());
return true;
return ((CraftEntity) passenger).getHandle().startRiding(getHandle());
} else {
return false;
}
}
@Override
public List<org.bukkit.entity.Entity> getPassengers() {
return Lists.newArrayList(Lists.transform(getHandle().passengers, new Function<Entity, org.bukkit.entity.Entity>() {
@Override
public org.bukkit.entity.Entity apply(Entity input) {
return input.getBukkitEntity();
}
}));
}
@Override
public boolean addPassenger(org.bukkit.entity.Entity passenger) {
Preconditions.checkArgument(passenger != null, "passenger == null");
return ((CraftEntity) passenger).getHandle().a(getHandle(), true);
}
@Override
public boolean removePassenger(org.bukkit.entity.Entity passenger) {
Preconditions.checkArgument(passenger != null, "passenger == null");
((CraftEntity) passenger).getHandle().stopRiding();
return true;
}
public boolean isEmpty() {
return !getHandle().isVehicle();
}
@ -347,7 +373,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
getPassenger().leaveVehicle();
getHandle().az(); // PAIL: rename
return true;
}