Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Global ID -> Id rename

Browse Source
This commit is contained in:
Erik Broes
2011-01-15 20:53:20 +01:00
parent e4a31ce206
commit dea72d6623
11 changed files with 87 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/EntityPlayerMP.java
View File

@@ -209,6 +209,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
public void a(int i, int j, int k) {
U();
System.out.println("OPEN_WINDOW for WorkBench");
a.b(((Packet) (new Packet100(bG, 1, "Crafting", 9))));
ap = ((CraftingInventoryCB) (new CraftingInventoryWorkbenchCB(an, l, i, j, k)));
ap.f = bG;
@@ -217,6 +218,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
public void a(IInventory iinventory) {
U();
System.out.println("OPEN_WINDOW for Chest");
a.b(((Packet) (new Packet100(bG, 0, iinventory.b(), iinventory.h_()))));
ap = ((CraftingInventoryCB) (new CraftingInventoryChestCB(((IInventory) (an)), iinventory)));
ap.f = bG;
@@ -225,6 +227,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
public void a(TileEntityFurnace tileentityfurnace) {
U();
System.out.println("OPEN_WINDOW for Furnace");
a.b(((Packet) (new Packet100(bG, 2, tileentityfurnace.b(), tileentityfurnace.h_()))));
ap = ((CraftingInventoryCB) (new CraftingInventoryFurnaceCB(((IInventory) (an)), tileentityfurnace)));
ap.f = bG;
@@ -233,6 +236,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
public void a(TileEntityDispenser tileentitydispenser) {
U();
System.out.println("OPEN_WINDOW for Dispenser");
a.b(((Packet) (new Packet100(bG, 3, tileentitydispenser.b(), tileentitydispenser.h_()))));
ap = ((CraftingInventoryCB) (new CraftingInventoryDispenserCB(((IInventory) (an)), tileentitydispenser)));
ap.f = bG;
@@ -243,20 +247,26 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting {
if (craftinginventorycb.a(i) instanceof SlotCrafting) {
return;
}
System.out.print("SET_SLOT for window: "+craftinginventorycb.f+" index: "+i+"and stack: "+itemstack);
if (am) {
System.out.println(" -- NOT SEND!");
return;
} else {
System.out.println(" -- SEND!");
a.b(((Packet) (new Packet103(craftinginventorycb.f, i, itemstack))));
return;
}
}
public void a(CraftingInventoryCB craftinginventorycb, List list) {
System.out.println("WINDOW_SLOTS for window: "+craftinginventorycb.f );
a.b(((Packet) (new Packet104(craftinginventorycb.f, list))));
System.out.println("SET_SLOT for item in hand: "+i+"and stack: "+an.i());
a.b(((Packet) (new Packet103(-1, -1, an.i()))));
}
public void a(CraftingInventoryCB craftinginventorycb, int i, int j) {
System.out.println(String.format("UPDATE_PROGRESS_BAR for window: %d [%d;%d]", craftinginventorycb.f, i, j));
a.b(((Packet) (new Packet105(craftinginventorycb.f, i, j))));
}

8
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@@ -282,15 +282,15 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start
CraftBlock block = (CraftBlock) player.getWorld().getBlockAt(l, i1, j1);
int blockID = block.getTypeID();
int blockId = block.getTypeId();
float damage = 0;
if(Block.m[blockID] != null) {
damage = Block.m[blockID].a(player.getHandle()); //Get amount of damage going to block
if(Block.m[blockId] != null) {
damage = Block.m[blockId].a(player.getHandle()); //Get amount of damage going to block
}
if (packet14blockdig.e == 0) {
if (i2 > 16 || flag) {
if(blockID > 0) {
if(blockId > 0) {
BlockDamagedEvent event;
// If the amount of damage that the player is going to do to the block
// is >= 1, then the block is going to break (eg, flowers, torches)