146 lines
7 KiB
Diff
146 lines
7 KiB
Diff
--- ../src_base/minecraft/net/minecraft/network/NetServerHandler.java
|
|
+++ ../src_work/minecraft/net/minecraft/network/NetServerHandler.java
|
|
@@ -64,6 +64,13 @@
|
|
import net.minecraft.util.MathHelper;
|
|
import net.minecraft.world.WorldServer;
|
|
|
|
+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
|
|
{
|
|
/** The logging system. */
|
|
@@ -235,6 +242,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);
|
|
@@ -327,6 +339,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);
|
|
@@ -349,10 +366,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;
|
|
@@ -360,7 +382,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)
|
|
{
|
|
@@ -379,6 +401,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);
|
|
@@ -447,7 +474,10 @@
|
|
double var13 = this.playerEntity.posZ - ((double)var8 + 0.5D);
|
|
double var15 = var9 * var9 + var11 * var11 + var13 * var13;
|
|
|
|
- if (var15 > 36.0D)
|
|
+ double dist = playerEntity.theItemInWorldManager.getBlockReachDistance() + 1;
|
|
+ dist *= dist;
|
|
+
|
|
+ if (var15 > dist)
|
|
{
|
|
return;
|
|
}
|
|
@@ -471,6 +501,7 @@
|
|
{
|
|
if (var18 <= var3 && !var4)
|
|
{
|
|
+ ForgeEventFactory.onPlayerInteract(playerEntity, Action.LEFT_CLICK_BLOCK, var6, var7, var8, 0);
|
|
this.playerEntity.playerNetServerHandler.sendPacketToPlayer(new Packet53BlockChange(var6, var7, var8, var2));
|
|
}
|
|
else
|
|
@@ -518,7 +549,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()))
|
|
{
|
|
@@ -536,7 +571,9 @@
|
|
var13 = var12;
|
|
}
|
|
|
|
- if (this.hasMoved && this.playerEntity.getDistanceSq((double)var5 + 0.5D, (double)var6 + 0.5D, (double)var7 + 0.5D) < 64.0D && (var13 > var9 || var10))
|
|
+ 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 && (var13 > var9 || var10))
|
|
{
|
|
this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset());
|
|
}
|
|
@@ -703,8 +740,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));
|
|
}
|
|
@@ -835,7 +876,7 @@
|
|
return;
|
|
}
|
|
|
|
- this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, 0, false);
|
|
+ this.playerEntity = this.mcServer.getConfigurationManager().respawnPlayer(this.playerEntity, playerEntity.dimension, false);
|
|
}
|
|
}
|
|
}
|