SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Make CraftMinecartHopper work as InventoryHolder. Adds BUKKIT-3796

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Michael Limiero 2013-03-17 15:50:34 -04:00 committet von Travis Watkins
Ursprung 93fd33e218
Commit 2642fbdf7e
3 geänderte Dateien mit 19 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
Datei anzeigen

@ -4,6 +4,7 @@ import java.util.Set;
import net.minecraft.server.Container; import net.minecraft.server.Container;
import net.minecraft.server.EntityHuman; import net.minecraft.server.EntityHuman;
import net.minecraft.server.EntityMinecartHopper;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.Packet100OpenWindow; import net.minecraft.server.Packet100OpenWindow;
import net.minecraft.server.Packet101CloseWindow; import net.minecraft.server.Packet101CloseWindow;
@ -193,14 +194,14 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
break; break;
case DISPENSER: case DISPENSER:
if (craftinv.getInventory() instanceof TileEntityDispenser) { if (craftinv.getInventory() instanceof TileEntityDispenser) {
getHandle().openDispenser((TileEntityDispenser)craftinv.getInventory()); getHandle().openDispenser((TileEntityDispenser) craftinv.getInventory());
} else { } else {
openCustomInventory(inventory, player, 3); openCustomInventory(inventory, player, 3);
} }
break; break;
case FURNACE: case FURNACE:
if (craftinv.getInventory() instanceof TileEntityFurnace) { if (craftinv.getInventory() instanceof TileEntityFurnace) {
getHandle().openFurnace((TileEntityFurnace)craftinv.getInventory()); getHandle().openFurnace((TileEntityFurnace) craftinv.getInventory());
} else { } else {
openCustomInventory(inventory, player, 2); openCustomInventory(inventory, player, 2);
} }
@ -210,7 +211,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
break; break;
case BREWING: case BREWING:
if (craftinv.getInventory() instanceof TileEntityBrewingStand) { if (craftinv.getInventory() instanceof TileEntityBrewingStand) {
getHandle().openBrewingStand((TileEntityBrewingStand)craftinv.getInventory()); getHandle().openBrewingStand((TileEntityBrewingStand) craftinv.getInventory());
} else { } else {
openCustomInventory(inventory, player, 5); openCustomInventory(inventory, player, 5);
} }
@ -220,7 +221,9 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
break; break;
case HOPPER: case HOPPER:
if (craftinv.getInventory() instanceof TileEntityHopper) { if (craftinv.getInventory() instanceof TileEntityHopper) {
getHandle().openHopper((TileEntityHopper)craftinv.getInventory()); getHandle().openHopper((TileEntityHopper) craftinv.getInventory());
} else if (craftinv.getInventory() instanceof EntityMinecartHopper) {
getHandle().openMinecartHopper((EntityMinecartHopper) craftinv.getInventory());
} }
break; break;
case CREATIVE: case CREATIVE:

11
src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
Datei anzeigen

@ -3,20 +3,29 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityMinecartHopper; import net.minecraft.server.EntityMinecartHopper;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.inventory.CraftInventory;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.minecart.HopperMinecart; import org.bukkit.entity.minecart.HopperMinecart;
import org.bukkit.inventory.Inventory;
final class CraftMinecartHopper extends CraftMinecart implements HopperMinecart { final class CraftMinecartHopper extends CraftMinecart implements HopperMinecart {
private final CraftInventory inventory;
CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
super(server, entity); super(server, entity);
inventory = new CraftInventory(entity);
} }
@Override @Override
public String toString() { public String toString() {
return "CraftMinecartHopper"; return "CraftMinecartHopper{" + "inventory=" + inventory + '}';
} }
public EntityType getType() { public EntityType getType() {
return EntityType.MINECART_HOPPER; return EntityType.MINECART_HOPPER;
} }
public Inventory getInventory() {
return inventory;
}
} }

4
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
Datei anzeigen

@ -6,6 +6,7 @@ import java.util.ListIterator;
import net.minecraft.server.ContainerAnvilInventory; import net.minecraft.server.ContainerAnvilInventory;
import net.minecraft.server.ContainerEnchantTableInventory; import net.minecraft.server.ContainerEnchantTableInventory;
import net.minecraft.server.IHopper;
import net.minecraft.server.IInventory; import net.minecraft.server.IInventory;
import net.minecraft.server.InventoryCrafting; import net.minecraft.server.InventoryCrafting;
import net.minecraft.server.InventoryEnderChest; import net.minecraft.server.InventoryEnderChest;
@ -15,7 +16,6 @@ import net.minecraft.server.TileEntityBeacon;
import net.minecraft.server.TileEntityBrewingStand; import net.minecraft.server.TileEntityBrewingStand;
import net.minecraft.server.TileEntityDispenser; import net.minecraft.server.TileEntityDispenser;
import net.minecraft.server.TileEntityFurnace; import net.minecraft.server.TileEntityFurnace;
import net.minecraft.server.TileEntityHopper;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.entity.HumanEntity; import org.bukkit.entity.HumanEntity;
@ -445,7 +445,7 @@ public class CraftInventory implements Inventory {
return InventoryType.BEACON; return InventoryType.BEACON;
} else if (inventory instanceof ContainerAnvilInventory) { } else if (inventory instanceof ContainerAnvilInventory) {
return InventoryType.ANVIL; return InventoryType.ANVIL;
} else if (inventory instanceof TileEntityHopper) { } else if (inventory instanceof IHopper) {
return InventoryType.HOPPER; return InventoryType.HOPPER;
} else { } else {
return InventoryType.CHEST; return InventoryType.CHEST;