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

Moved getVehicle, leaveVehicle and isInsideVehicle from CraftLivingEntity to CraftEntity. Addresses BUKKIT-811

Browse Source
This commit is contained in:
TomyLobo 2011-10-25 15:53:43 +02:00 committed by EvilSeph
parent 1394926e53
commit 53e4a034f4
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.entity.Vehicle;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -342,4 +343,25 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public void removeMetadata(String metadataKey, Plugin owningPlugin) { public void removeMetadata(String metadataKey, Plugin owningPlugin) {
server.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin); server.getEntityMetadata().removeMetadata(this, metadataKey, owningPlugin);
} }
public boolean isInsideVehicle() {
return getHandle().vehicle != null;
}
public boolean leaveVehicle() {
if (getHandle().vehicle == null) {
return false;
}
getHandle().setPassengerOf(null);
return true;
}
public org.bukkit.entity.Entity getVehicle() {
if (getHandle().vehicle == null) {
return null;
}
return getHandle().vehicle.getBukkitEntity();
}
} }

26
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@ -128,32 +128,6 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return launchProjectile(Arrow.class); return launchProjectile(Arrow.class);
} }
public boolean isInsideVehicle() {
return getHandle().vehicle != null;
}
public boolean leaveVehicle() {
if (getHandle().vehicle == null) {
return false;
}
getHandle().setPassengerOf(null);
return true;
}
public Vehicle getVehicle() {
if (getHandle().vehicle == null) {
return null;
}
org.bukkit.entity.Entity vehicle = (getHandle().vehicle.getBukkitEntity());
if (vehicle instanceof Vehicle) {
return (Vehicle) vehicle;
}
return null;
}
public int getRemainingAir() { public int getRemainingAir() {
return getHandle().getAirTicks(); return getHandle().getAirTicks();
} }