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

Depreceated getCraftEntity() as it has been superceded by

Browse Source 
getBukkitEntity()
This commit is contained in:
Andrew Ardill 2011-01-17 16:26:47 +08:00 committed by Dinner Bone
parent 6a3b096fb8
commit c862626c02
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -3,6 +3,7 @@ package org.bukkit.craftbukkit;
import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.entity.*; import org.bukkit.craftbukkit.entity.*;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -113,6 +114,8 @@ public class CraftWorld implements World {
EntityItem entity = new EntityItem(world, loc.getX(), loc.getY(), loc.getZ(), stack); EntityItem entity = new EntityItem(world, loc.getX(), loc.getY(), loc.getZ(), stack);
entity.c = 10; entity.c = 10;
world.a(entity); world.a(entity);
//TODO this is inconsistent with how Entity.getBukkitEntity() works.
// However, this entity is not at the moment backed by a server entity class so it may be left.
return new CraftItemDrop(world.getServer(), entity); return new CraftItemDrop(world.getServer(), entity);
} }
@ -132,7 +135,7 @@ public class CraftWorld implements World {
arrow.c(loc.getX(), loc.getY(), loc.getZ(), 0, 0); arrow.c(loc.getX(), loc.getY(), loc.getZ(), 0, 0);
world.a(arrow); world.a(arrow);
arrow.a(velocity.getX(), velocity.getY(), velocity.getZ(), speed, spread); arrow.a(velocity.getX(), velocity.getY(), velocity.getZ(), speed, spread);
return new CraftArrow(world.getServer(), arrow); return (Arrow) arrow.getBukkitEntity();
} }
public Minecart spawnMinecart(Location loc) { public Minecart spawnMinecart(Location loc) {
@ -168,13 +171,13 @@ public class CraftWorld implements World {
CraftMinecart.Type.PoweredMinecart.getId() CraftMinecart.Type.PoweredMinecart.getId()
); );
world.a(minecart); world.a(minecart);
return new CraftPoweredMinecart(world.getServer(), minecart); return (PoweredMinecart) minecart.getBukkitEntity();
} }
public Boat spawnBoat(Location loc) { public Boat spawnBoat(Location loc) {
EntityBoat boat = new EntityBoat(world, loc.getX(), loc.getY(), loc.getZ()); EntityBoat boat = new EntityBoat(world, loc.getX(), loc.getY(), loc.getZ());
world.a(boat); world.a(boat);
return new CraftBoat(world.getServer(), boat); return (Boat) boat.getBukkitEntity();
} }
public boolean generateTree(Location loc) { public boolean generateTree(Location loc) {
@ -187,6 +190,7 @@ public class CraftWorld implements World {
return treeGen.a(world, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()); return treeGen.a(world, rand, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
} }
/**@deprecated*/
public CraftEntity toCraftEntity(net.minecraft.server.Entity entity) { public CraftEntity toCraftEntity(net.minecraft.server.Entity entity) {
if (entity instanceof CraftMappable) { if (entity instanceof CraftMappable) {
return ((CraftMappable)entity).getCraftEntity(); return ((CraftMappable)entity).getCraftEntity();