Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Do fully player cloning to avoid duping of items (probably related to #301)

Browse Source
This commit is contained in:
Sergey
2016-01-31 20:08:36 +07:00
parent 201b43272f
commit 8c5b2f7229
3 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/net/minecraft/server/management/ServerConfigurationManager.java.patch
View File

@ -380,7 +380,7 @@
public EntityPlayerMP createPlayerForUser(GameProfile p_148545_1_)
{
UUID uuid = EntityPlayer.func_146094_a(p_148545_1_);
@@ -410,80 +619,200 @@
@@ -410,80 +619,204 @@
return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), p_148545_1_, (ItemInWorldManager)object);
}
@ -487,7 +487,7 @@
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled() || event.getTo() == null)
+ {
+ return null;
+ return par1EntityPlayerMP;
+ }
+ }
+
@ -501,12 +501,16 @@
+ // Phase 4 - handle bed spawn
+ ChunkCoordinates bedSpawnChunkCoords = par1EntityPlayerMP.getBedLocation(targetDimension);
+ boolean spawnForced = par1EntityPlayerMP.isSpawnForced(targetDimension);
+ par1EntityPlayerMP.dimension = targetDimension;
+ // CraftBukkit start
+ EntityPlayerMP entityplayermp1 = par1EntityPlayerMP;
+ par1EntityPlayerMP.dimension = targetDimension;
+ EntityPlayerMP entityplayermp1 = new EntityPlayerMP(mcServer, mcServer.worldServerForDimension(targetDimension), par1EntityPlayerMP.getGameProfile(), new ItemInWorldManager(mcServer.worldServerForDimension(targetDimension)));
+ entityplayermp1.playerNetServerHandler = par1EntityPlayerMP.playerNetServerHandler;
+ entityplayermp1.playerNetServerHandler.playerEntity = entityplayermp1;
+ entityplayermp1.clonePlayer(par1EntityPlayerMP, returnFromEnd); // KCauldron - clone player
+ entityplayermp1.setWorld(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension)); // make sure to update reference for bed spawn logic
+ entityplayermp1.setWorld(mcServer.worldServerForDimension(targetDimension));;
+ entityplayermp1.playerConqueredTheEnd = false;
+ entityplayermp1.setEntityId(par1EntityPlayerMP.getEntityId());
+ func_72381_a(entityplayermp1, par1EntityPlayerMP, mcServer.worldServerForDimension(targetDimension));
ChunkCoordinates chunkcoordinates1;
+ boolean isBedSpawn = false;
+ org.bukkit.World toWorld = entityplayermp1.getBukkitEntity().getWorld();
@ -621,7 +625,7 @@
return entityplayermp1;
}
@@ -492,34 +821,112 @@
@@ -492,34 +825,112 @@
transferPlayerToDimension(p_72356_1_, p_72356_2_, mcServer.worldServerForDimension(p_72356_2_).getDefaultTeleporter());
}
@ -753,7 +757,7 @@
}
public void transferEntityToWorld(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_, Teleporter teleporter)
@@ -605,6 +1012,109 @@
@@ -605,6 +1016,109 @@
p_82448_1_.setWorld(p_82448_4_);
}
@ -863,7 +867,7 @@
public void sendPlayerInfoToAllPlayers()
{
if (++this.playerPingIndex > 600)
@@ -612,11 +1122,13 @@
@@ -612,11 +1126,13 @@
this.playerPingIndex = 0;
}
@ -877,7 +881,7 @@
}
public void sendPacketToAllPlayers(Packet p_148540_1_)
@@ -877,13 +1389,24 @@
@@ -877,13 +1393,24 @@
for (int j = 0; j < this.playerEntityList.size(); ++j)
{
EntityPlayerMP entityplayermp = (EntityPlayerMP)this.playerEntityList.get(j);
@ -904,7 +908,7 @@
if (d4 * d4 + d5 * d5 + d6 * d6 < p_148543_8_ * p_148543_8_)
{
entityplayermp.playerNetServerHandler.sendPacket(p_148543_11_);
@@ -941,13 +1464,16 @@
@@ -941,13 +1468,16 @@
p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(1, 0.0F));
p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(7, p_72354_2_.getRainStrength(1.0F)));
p_72354_1_.playerNetServerHandler.sendPacket(new S2BPacketChangeGameState(8, p_72354_2_.getWeightedThunderStrength(1.0F)));
@ -922,7 +926,7 @@
p_72385_1_.playerNetServerHandler.sendPacket(new S09PacketHeldItemChange(p_72385_1_.inventory.currentItem));
}
@@ -961,9 +1487,17 @@
@@ -961,9 +1491,17 @@
return this.maxPlayers;
}
@ -941,7 +945,7 @@
}
public void setWhiteListEnabled(boolean p_72371_1_)
@@ -1032,12 +1566,30 @@
@@ -1032,12 +1570,30 @@
public void removeAllPlayers()
{