xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

fix block snapshot restore bug,add entity restore

Browse Source
This commit is contained in:
聪聪 2017-06-25 19:10:06 +08:00
parent 597d028218
commit a9e1137c30
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
patches/net/minecraftforge/common/ForgeHooks.java.patch
View File

@ -65,7 +65,7 @@
{ {
// Let the client know the block still exists // Let the client know the block still exists
entityPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world)); entityPlayer.playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
@@ -500,81 +514,137 @@ @@ -500,81 +514,144 @@
if (!(itemstack.getItem() instanceof ItemBucket)) // if not bucket if (!(itemstack.getItem() instanceof ItemBucket)) // if not bucket
{ {
world.captureBlockSnapshots = true; world.captureBlockSnapshots = true;
@ -169,6 +169,8 @@
+ List<net.minecraftforge.common.util.BlockSnapshot> blockSnapshots = (List<net.minecraftforge.common.util.BlockSnapshot>) world.capturedBlockSnapshots + List<net.minecraftforge.common.util.BlockSnapshot> blockSnapshots = (List<net.minecraftforge.common.util.BlockSnapshot>) world.capturedBlockSnapshots
+ .clone(); + .clone();
+ world.capturedBlockSnapshots.clear(); + world.capturedBlockSnapshots.clear();
+ List<net.minecraftforge.common.util.EntitySnapshot> tDropItemSnapshots=(List<net.minecraftforge.common.util.EntitySnapshot>)world.capturedItems.clone();
+ world.capturedItems.clear();
+ +
+ // make sure to set pre-placement item data for event + // make sure to set pre-placement item data for event
+ itemstack.setItemDamage(meta); + itemstack.setItemDamage(meta);
@ -202,13 +204,14 @@
- if (newBlock != null && !(newBlock.hasTileEntity(metadata))) // Containers get placed automatically - if (newBlock != null && !(newBlock.hasTileEntity(metadata))) // Containers get placed automatically
+ flag = false; // cancel placement + flag = false; // cancel placement
+ // revert back all captured blocks + // revert back all captured blocks
+ for (net.minecraftforge.common.util.BlockSnapshot blocksnapshot : blockSnapshots) + for(int i=blockSnapshots.size();i>0;){
{ + world.restoringBlockSnapshots=true;
- newBlock.onBlockAdded(world, blockX, blockY, blockZ); + blockSnapshots.get(--i).restore(true,false);
+ world.restoringBlockSnapshots = true; + world.restoringBlockSnapshots=false;
+ blocksnapshot.restore(true, false); + }
+ world.restoringBlockSnapshots = false; + for(net.minecraftforge.common.util.EntitySnapshot sEntityItem : tDropItemSnapshots){
} + sEntityItem.cancel();
+ }
+ } + }
+ else + else
+ { + {
@ -216,9 +219,10 @@
+ itemstack.setItemDamage(newMeta); + itemstack.setItemDamage(newMeta);
+ itemstack.stackSize = newSize; + itemstack.stackSize = newSize;
+ if (nbt != null) + if (nbt != null)
+ { {
- newBlock.onBlockAdded(world, blockX, blockY, blockZ);
+ itemstack.setTagCompound(newNBT); + itemstack.setTagCompound(newNBT);
+ } }
- world.markAndNotifyBlock(blockX, blockY, blockZ, null, oldBlock, newBlock, updateFlag); - world.markAndNotifyBlock(blockX, blockY, blockZ, null, oldBlock, newBlock, updateFlag);
+ for (net.minecraftforge.common.util.BlockSnapshot blocksnapshot : blockSnapshots) + for (net.minecraftforge.common.util.BlockSnapshot blocksnapshot : blockSnapshots)
@ -240,6 +244,9 @@
+ +
+ world.markAndNotifyBlock(blockX, blockY, blockZ, null, oldBlock, newBlock, updateFlag); + world.markAndNotifyBlock(blockX, blockY, blockZ, null, oldBlock, newBlock, updateFlag);
+ } + }
+ for(net.minecraftforge.common.util.EntitySnapshot sEntityItem : tDropItemSnapshots){
+ sEntityItem.apply();
+ }
+ player.addStat(StatList.objectUseStats[Item.getIdFromItem(itemstack.getItem())], 1); + player.addStat(StatList.objectUseStats[Item.getIdFromItem(itemstack.getItem())], 1);
} }
- player.addStat(StatList.objectUseStats[Item.getIdFromItem(itemstack.getItem())], 1); - player.addStat(StatList.objectUseStats[Item.getIdFromItem(itemstack.getItem())], 1);