xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Initial autoupdater

Browse Source
This commit is contained in:
Prototik
2015-05-31 18:21:26 +07:00
parent 8c7ff941cf
commit de86e3c9f6
16 changed files with 817 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,7 @@
NBTTagCompound nbttagcompound1;
if (p_72380_1_.getCommandSenderName().equals(this.mcServer.getServerOwner()) && nbttagcompound != null)
@@ -294,18 +350,60 @@
@@ -294,18 +350,61 @@
public void playerLoggedIn(EntityPlayerMP p_72377_1_)
{
@ -215,10 +215,11 @@
+ p_72377_1_.playerNetServerHandler.sendPacket(new S38PacketPlayerListItem(entityplayermp1.listName, true, entityplayermp1.ping));
+ }
+ // CraftBukkit end
+ kcauldron.updater.DefaultUpdateCallback.INSTANCE.onPlayerJoin(playerJoinEvent);
}
public void updatePlayerPertinentChunks(EntityPlayerMP p_72358_1_)
@@ -313,14 +411,33 @@
@@ -313,14 +412,33 @@
p_72358_1_.getServerForPlayer().getPlayerManager().updatePlayerPertinentChunks(p_72358_1_);
}
@ -254,7 +255,7 @@
{
worldserver.removePlayerEntityDangerously(p_72367_1_.ridingEntity);
logger.debug("removing player mount");
@@ -329,9 +446,35 @@
@@ -329,9 +447,35 @@
worldserver.removeEntity(p_72367_1_);
worldserver.getPlayerManager().removePlayer(p_72367_1_);
this.playerEntityList.remove(p_72367_1_);
@ -293,7 +294,7 @@
}
public String allowUserToConnect(SocketAddress p_148542_1_, GameProfile p_148542_2_)
@@ -372,6 +515,71 @@
@@ -372,6 +516,71 @@
}
}
@ -357,7 +358,7 @@
+ loginlistener.func_147322_a(event.getKickMessage());
+ return null;
+ }
+
+
+ return entity;
+ }
+ // CraftBukkit end
@ -365,7 +366,7 @@
public EntityPlayerMP createPlayerForUser(GameProfile p_148545_1_)
{
UUID uuid = EntityPlayer.func_146094_a(p_148545_1_);
@@ -410,80 +618,199 @@
@@ -410,80 +619,199 @@
return new EntityPlayerMP(this.mcServer, this.mcServer.worldServerForDimension(0), p_148545_1_, (ItemInWorldManager)object);
}
@ -605,7 +606,7 @@
return entityplayermp1;
}
@@ -492,34 +819,112 @@
@@ -492,34 +820,112 @@
transferPlayerToDimension(p_72356_1_, p_72356_2_, mcServer.worldServerForDimension(p_72356_2_).getDefaultTeleporter());
}
@ -737,7 +738,7 @@
}
public void transferEntityToWorld(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_, Teleporter teleporter)
@@ -605,6 +1010,109 @@
@@ -605,6 +1011,109 @@
p_82448_1_.setWorld(p_82448_4_);
}
@ -847,7 +848,7 @@
public void sendPlayerInfoToAllPlayers()
{
if (++this.playerPingIndex > 600)
@@ -612,11 +1120,13 @@
@@ -612,11 +1121,13 @@
this.playerPingIndex = 0;
}
@ -861,7 +862,7 @@
}
public void sendPacketToAllPlayers(Packet p_148540_1_)
@@ -877,13 +1387,24 @@
@@ -877,13 +1388,24 @@
for (int j = 0; j < this.playerEntityList.size(); ++j)
{
EntityPlayerMP entityplayermp = (EntityPlayerMP)this.playerEntityList.get(j);
@ -888,7 +889,7 @@
if (d4 * d4 + d5 * d5 + d6 * d6 < p_148543_8_ * p_148543_8_)
{
entityplayermp.playerNetServerHandler.sendPacket(p_148543_11_);
@@ -941,13 +1462,16 @@
@@ -941,13 +1463,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)));
@ -906,7 +907,7 @@
p_72385_1_.playerNetServerHandler.sendPacket(new S09PacketHeldItemChange(p_72385_1_.inventory.currentItem));
}
@@ -961,9 +1485,17 @@
@@ -961,9 +1486,17 @@
return this.maxPlayers;
}
@ -925,7 +926,7 @@
}
public void setWhiteListEnabled(boolean p_72371_1_)
@@ -1032,12 +1564,30 @@
@@ -1032,12 +1565,30 @@
public void removeAllPlayers()
{