--- ../src_base/common/net/minecraft/src/NetServerHandler.java +++ ../src_work/common/net/minecraft/src/NetServerHandler.java @@ -10,6 +10,12 @@ import cpw.mods.fml.common.network.FMLNetworkHandler; import net.minecraft.server.MinecraftServer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.Event; +import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; public class NetServerHandler extends NetHandler { @@ -193,6 +199,11 @@ if (this.playerEntity.ridingEntity != null) { this.playerEntity.ridingEntity.updateRiderPosition(); + } + + if (!this.hasMoved) //Fixes teleportation kick while riding entities + { + return; } this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); @@ -285,6 +296,11 @@ this.playerEntity.addExhaustion(0.2F); } + if (!this.hasMoved) //Fixes "Moved Too Fast" kick when being teleported while moving + { + return; + } + this.playerEntity.moveEntity(var13, var15, var17); this.playerEntity.onGround = par1Packet10Flying.onGround; this.playerEntity.addMovementStat(var13, var15, var17); @@ -307,10 +323,15 @@ logger.warning(this.playerEntity.username + " moved wrongly!"); } + if (!this.hasMoved) //Fixes "Moved Too Fast" kick when being teleported while moving + { + return; + } + this.playerEntity.setPositionAndRotation(var5, var7, var9, var11, var12); boolean var32 = var2.getCollidingBoundingBoxes(this.playerEntity, this.playerEntity.boundingBox.copy().contract((double)var27, (double)var27, (double)var27)).isEmpty(); - if (var28 && (var31 || !var32) && !this.playerEntity.isPlayerSleeping()) + if (var28 && (var31 || !var32) && !this.playerEntity.isPlayerSleeping() && !this.playerEntity.noClip) { this.setPlayerLocation(this.lastPosX, this.lastPosY, this.lastPosZ, var11, var12); return; @@ -318,7 +339,7 @@ AxisAlignedBB var33 = this.playerEntity.boundingBox.copy().expand((double)var27, (double)var27, (double)var27).addCoord(0.0D, -0.55D, 0.0D); - if (!this.mcServer.isFlightAllowed() && !this.playerEntity.theItemInWorldManager.isCreative() && !var2.isAABBNonEmpty(var33)) + if (!this.mcServer.isFlightAllowed() && !this.playerEntity.theItemInWorldManager.isCreative() && !var2.isAABBNonEmpty(var33) && !this.playerEntity.capabilities.allowFlying) { if (var29 >= -0.03125D) { @@ -337,6 +358,11 @@ this.ticksForFloatKick = 0; } + if (!this.hasMoved) //Fixes "Moved Too Fast" kick when being teleported while moving + { + return; + } + this.playerEntity.onGround = par1Packet10Flying.onGround; this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); this.playerEntity.updateFlyingState(this.playerEntity.posY - var3, par1Packet10Flying.onGround); @@ -395,7 +421,10 @@ double var12 = this.playerEntity.posZ - ((double)var7 + 0.5D); double var14 = var8 * var8 + var10 * var10 + var12 * var12; - if (var14 > 36.0D) + double dist = playerEntity.theItemInWorldManager.getBlockReachDistance() + 1; + dist *= dist; + + if (var14 > dist) { return; } @@ -419,6 +448,7 @@ { if (var20 <= this.mcServer.func_82357_ak() && !var3) { + ForgeEventFactory.onPlayerInteract(playerEntity, Action.LEFT_CLICK_BLOCK, var5, var6, var7, 0); this.playerEntity.playerNetServerHandler.sendPacketToPlayer(new Packet53BlockChange(var5, var6, var7, var2)); } else @@ -477,7 +507,11 @@ return; } - this.playerEntity.theItemInWorldManager.tryUseItem(this.playerEntity, var2, var3); + PlayerInteractEvent event = ForgeEventFactory.onPlayerInteract(playerEntity, PlayerInteractEvent.Action.RIGHT_CLICK_AIR, 0, 0, 0, -1); + if (event.useItem != Event.Result.DENY) + { + this.playerEntity.theItemInWorldManager.tryUseItem(this.playerEntity, var2, var3); + } } else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit())) { @@ -495,7 +529,9 @@ var12 = var11; } - if (this.hasMoved && this.playerEntity.getDistanceSq((double)var5 + 0.5D, (double)var6 + 0.5D, (double)var7 + 0.5D) < 64.0D && (var12 > this.mcServer.func_82357_ak() || var9)) + double dist = playerEntity.theItemInWorldManager.getBlockReachDistance() + 1; + dist *= dist; + if (this.hasMoved && this.playerEntity.getDistanceSq((double)var5 + 0.5D, (double)var6 + 0.5D, (double)var7 + 0.5D) < dist && (var12 > this.mcServer.func_82357_ak() || var9)) { this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); } @@ -662,8 +698,12 @@ this.sendPacketToPlayer(new Packet3Chat("Cannot send chat message.")); return; } - - var2 = "<" + this.playerEntity.username + "> " + var2; + ServerChatEvent event = new ServerChatEvent(this.playerEntity, var2, "<" + this.playerEntity.username + "> " + var2); + if (MinecraftForge.EVENT_BUS.post(event)) + { + return; + } + var2 = event.line; logger.info(var2); this.mcServer.getConfigurationManager().sendPacketToAllPlayers(new Packet3Chat(var2, false)); } @@ -794,7 +834,7 @@ return; } - this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, 0, false); + this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, playerEntity.dimension, false); } } }