diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 573c0f04..14f2521e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -102,7 +102,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.getBukkitEntity().setExtraData(nbttagcompound); // CraftBukkit } - // CraftBukkit start - world fallback code, either respawn location or global spawn + // CraftBukkit start - World fallback code, either respawn location or global spawn public void spawnIn(World world) { super.spawnIn(world); if (world == null) { @@ -366,7 +366,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } else { if (this.dimension == 1 && i == 0) { this.a((Statistic) AchievementList.B); - // CraftBukkit start - rely on custom portal management + // CraftBukkit start - Rely on custom portal management /* ChunkCoordinates chunkcoordinates = this.server.getWorldServer(i).getDimensionSpawn(); @@ -461,7 +461,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void startCrafting(int i, int j, int k) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerWorkbench(this.inventory, this.world, i, j, k)); if(container == null) return; // CraftBukkit end @@ -474,7 +474,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void startEnchanting(int i, int j, int k, String s) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerEnchantTable(this.inventory, this.world, i, j, k)); if(container == null) return; // CraftBukkit end @@ -487,7 +487,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openAnvil(int i, int j, int k) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerAnvil(this.inventory, this.world, i, j, k, this)); if(container == null) return; // CraftBukkit end @@ -504,7 +504,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.closeInventory(); } - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerChest(this.inventory, iinventory)); if(container == null) return; // CraftBukkit end @@ -517,7 +517,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openHopper(TileEntityHopper tileentityhopper) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, tileentityhopper)); if(container == null) return; // CraftBukkit end @@ -530,7 +530,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openMinecartHopper(EntityMinecartHopper entityminecarthopper) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerHopper(this.inventory, entityminecarthopper)); if(container == null) return; // CraftBukkit end @@ -543,7 +543,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openFurnace(TileEntityFurnace tileentityfurnace) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerFurnace(this.inventory, tileentityfurnace)); if(container == null) return; // CraftBukkit end @@ -556,7 +556,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openDispenser(TileEntityDispenser tileentitydispenser) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerDispenser(this.inventory, tileentitydispenser)); if(container == null) return; // CraftBukkit end @@ -569,7 +569,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openBrewingStand(TileEntityBrewingStand tileentitybrewingstand) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBrewingStand(this.inventory, tileentitybrewingstand)); if(container == null) return; // CraftBukkit end @@ -582,7 +582,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openBeacon(TileEntityBeacon tileentitybeacon) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerBeacon(this.inventory, tileentitybeacon)); if(container == null) return; // CraftBukkit end @@ -595,7 +595,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void openTrade(IMerchant imerchant, String s) { - // CraftBukkit start - inventory open hook + // CraftBukkit start - Inventory open hook Container container = CraftEventFactory.callInventoryOpenEvent(this, new ContainerMerchant(this.inventory, imerchant, this.world)); if(container == null) return; // CraftBukkit end @@ -638,7 +638,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void a(Container container, List list) { this.playerConnection.sendPacket(new Packet104WindowItems(container.windowId, list)); this.playerConnection.sendPacket(new Packet103SetSlot(-1, -1, this.inventory.getCarried())); - // CraftBukkit start - send a Set Slot to update the crafting result slot + // CraftBukkit start - Send a Set Slot to update the crafting result slot if (java.util.EnumSet.of(InventoryType.CRAFTING,InventoryType.WORKBENCH).contains(container.getBukkitView().getType())) { this.playerConnection.sendPacket(new Packet103SetSlot(container.windowId, 0, container.getSlot(0).getItem())); } @@ -835,7 +835,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public WeatherType getPlayerWeather() { return this.weather; } - + public void setPlayerWeather(WeatherType type, boolean plugin) { if (!plugin && this.weather != null) { return; @@ -847,7 +847,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.playerConnection.sendPacket(new Packet70Bed(type == WeatherType.DOWNFALL ? 1 : 2, 0)); } - + public void resetPlayerWeather() { this.weather = null; this.setPlayerWeather(this.o().getWorldData().hasStorm() ? WeatherType.DOWNFALL : WeatherType.CLEAR, false); |