DataBlockTileEntityPerClass is now sending the block & mod name.

Adv side detection is now working a bit better (handle worker threads for Rcon)
PacketManager will try to dispatch the packets to the FakePlayers when doing an untargeted send.
PacketManager handling of fake player is done on the sendToPlayer level.
Rcon connections are reproducing the "player logged in" behavior.
This commit is contained in:
ProfMobius committed 2014-10-03 18:27:45 +02:00
1 parent 572d0158cb
commit 0c7e17c061
6 files changed
+36 -11

No files matched your search

@@ -220,9 +220,14 @@ public class PacketManager
public static void sendToPlayer(PacketBase packet, EntityPlayer player)
{
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
channels.get(SERVER).writeAndFlush(packet);
if (player instanceof FakePlayer){
RConServer.instance.sendToPlayer(packet, (FakePlayer)player);
}
else {
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
channels.get(SERVER).writeAndFlush(packet);
}
}
public static void sendToPlayer(Packet packet, EntityPlayerMP player)
@@ -248,6 +253,10 @@ public class PacketManager
{
channels.get(SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL);
channels.get(SERVER).writeAndFlush(packet);
for (FakePlayer fakePlayer : RConServer.instance.fakePlayers.keySet()){
RConServer.instance.sendToPlayer(packet, fakePlayer);
}
}
public static Packet toMcPacket(PacketBase packet)
@@ -272,10 +281,6 @@ public class PacketManager
*/
public static void validateAndSend(PacketBase capsule, EntityPlayerMP player){
if (player instanceof FakePlayer){
RConServer.instance.sendToPlayer(capsule, (FakePlayer)player);
}
if (!capsule.msg.isDisplayActive(PlayerTracker.INSTANCE.getPlayerSelectedTab(player))) return;
if (capsule.msg.canPlayerUseCommand(player))