Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-12 12:16:41 +01:00
Code Issues Projects Releases Wiki Activity

added handling of powered and storage minecarts

Browse Source
This commit is contained in:
Andrew Ardill 2011-01-17 07:34:31 +08:00 committed by Dinner Bone
parent 2de3e2e7e4
commit 3400eafaf1
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minecraft/server/EntityMinecart.java
View File

@ -7,6 +7,8 @@ import java.util.Random;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.entity.CraftEgg; import org.bukkit.craftbukkit.entity.CraftEgg;
import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPoweredMinecart;
import org.bukkit.craftbukkit.entity.CraftStorageMinecart;
import org.bukkit.craftbukkit.CraftMappable; import org.bukkit.craftbukkit.CraftMappable;
import org.bukkit.craftbukkit.entity.CraftMinecart; import org.bukkit.craftbukkit.entity.CraftMinecart;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
@ -96,6 +98,8 @@ public class EntityMinecart extends Entity implements IInventory, CraftMappable
private double at; private double at;
// CraftBukkit start // CraftBukkit start
protected org.bukkit.entity.Entity bukkitPoweredMinecart; //CraftBukkit
protected org.bukkit.entity.Entity bukkitStorageMinecart; //CraftBukkit
private CraftMinecart minecart; private CraftMinecart minecart;
private boolean slowWhenEmpty = true; private boolean slowWhenEmpty = true;
@ -128,9 +132,10 @@ public class EntityMinecart extends Entity implements IInventory, CraftMappable
handleCreation(world); // CraftBukkit handleCreation(world); // CraftBukkit
//CraftBukkit start //CraftBukkit start
//TODO need to handle powered and storage minecarts
CraftServer server = ((WorldServer) this.l).getServer(); CraftServer server = ((WorldServer) this.l).getServer();
this.bukkitEntity = new CraftMinecart(server, this); this.bukkitEntity = new CraftMinecart(server, this);
this.bukkitPoweredMinecart = new CraftPoweredMinecart(server, this);
this.bukkitStorageMinecart = new CraftStorageMinecart(server, this);
//CraftBukkit end //CraftBukkit end
} }
@ -802,4 +807,17 @@ public class EntityMinecart extends Entity implements IInventory, CraftMappable
} }
return entityplayer.b(((Entity) (this))) <= 64D; return entityplayer.b(((Entity) (this))) <= 64D;
} }
//CraftBukkit start
@Override
public org.bukkit.entity.Entity getBukkitEntity(){
if (this.d == CraftMinecart.Type.StorageMinecart.getId()) {
return this.bukkitStorageMinecart;
} else if (this.d == CraftMinecart.Type.PoweredMinecart.getId()) {
return this.bukkitPoweredMinecart;
} else {
return this.bukkitEntity;
}
}
//CraftBukkit end
} }