xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Implement ReverseClonner, which should fix all issues with teleportation/inventories/crashed after respawning

Browse Source
This commit is contained in:
Sergey Shatunov
2016-02-06 04:29:03 +07:00
parent 313adcfbb0
commit 0b251c5440
10 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/net/minecraft/entity/player/EntityPlayer.java.patch
View File

@ -23,12 +23,8 @@
public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender
{
public static final String PERSISTED_NBT_TAG = "PlayerPersisted";
@@ -99,10 +115,10 @@
private HashMap<Integer, Boolean> spawnForcedMap = new HashMap<Integer, Boolean>();
public InventoryPlayer inventory = new InventoryPlayer(this);
- private InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest();
+ public InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest();
@@ -102,7 +118,7 @@
private InventoryEnderChest theInventoryEnderChest = new InventoryEnderChest();
public Container inventoryContainer;
public Container openContainer;
- protected FoodStats foodStats = new FoodStats();
@ -503,12 +499,12 @@
}
}
@@ -2023,7 +2246,7 @@
this.setScore(p_71049_1_.getScore());
@@ -2035,7 +2258,7 @@
{
getEntityData().setTag(PERSISTED_NBT_TAG, old.getCompoundTag(PERSISTED_NBT_TAG));
}
- MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerEvent.Clone(this, p_71049_1_, !p_71049_2_));
+ //MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.entity.player.PlayerEvent.Clone(this, p_71049_1_, !p_71049_2_)); // KCauldron - moved to ReverseClonner
}
- this.theInventoryEnderChest = p_71049_1_.theInventoryEnderChest;
+ // this.theInventoryEnderChest = p_71049_1_.theInventoryEnderChest; // KCauldron - moved up
this.spawnChunkMap = p_71049_1_.spawnChunkMap;
this.spawnForcedMap = p_71049_1_.spawnForcedMap;
protected boolean canTriggerWalking()

11
patches/net/minecraft/entity/player/EntityPlayerMP.java.patch
View File

@ -705,16 +705,7 @@
public void addChatComponentMessage(IChatComponent p_146105_1_)
{
this.playerNetServerHandler.sendPacket(new S02PacketChat(p_146105_1_));
@@ -878,6 +1204,8 @@
public void clonePlayer(EntityPlayer p_71049_1_, boolean p_71049_2_)
{
+ this.theInventoryEnderChest = p_71049_1_.theInventoryEnderChest;
+ if (p_71049_1_ instanceof EntityPlayerMP) ((org.bukkit.craftbukkit.entity.CraftLivingEntity) (bukkitEntity = ((EntityPlayerMP) p_71049_1_).bukkitEntity)).updateEntity(this);
super.clonePlayer(p_71049_1_, p_71049_2_);
this.lastExperience = -1;
this.lastHealth = -1.0F;
@@ -1037,6 +1365,114 @@
@@ -1037,6 +1363,114 @@
return this.field_143005_bX;
}