Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 21:10:17 +01:00
Code Issues Projekte Releases Wiki Aktivität

Cleaning up some redundant code.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-04-29 02:08:46 -04:00
Ursprung 97c5f2bb8e
Commit 9d7a03a64a
1 geänderte Dateien mit 18 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

26
src/main/java/net/minecraft/server/NetServerHandler.java
Datei anzeigen

@ -147,35 +147,35 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
} }
if (Math.abs(packet10flying.x) > 32000000 || Math.abs(packet10flying.z) > 32000000) { if (Math.abs(packet10flying.x) > 32000000 || Math.abs(packet10flying.z) > 32000000) {
player.teleport(player.getServer().getWorld(player.getWorld().getName()).getSpawnLocation()); player.teleport(player.getWorld().getSpawnLocation());
System.err.println(player.getName() + " was caught trying to crash the server with an invalid position."); System.err.println(player.getName() + " was caught trying to crash the server with an invalid position.");
player.kickPlayer("Nope!"); player.kickPlayer("Nope!");
return; return;
} }
if (Double.isNaN(packet10flying.x) || packet10flying.x == Double.POSITIVE_INFINITY || packet10flying.x == Double.NEGATIVE_INFINITY) { if (Double.isNaN(packet10flying.x) || packet10flying.x == Double.POSITIVE_INFINITY || packet10flying.x == Double.NEGATIVE_INFINITY) {
player.teleport(player.getServer().getWorld(player.getWorld().getName()).getSpawnLocation()); player.teleport(player.getWorld().getSpawnLocation());
System.err.println(player.getName() + " was caught trying to set an invalid position."); System.err.println(player.getName() + " was caught trying to set an invalid position.");
player.kickPlayer("Nope!"); player.kickPlayer("Nope!");
return; return;
} }
if (Double.isNaN(packet10flying.y) || packet10flying.y == Double.POSITIVE_INFINITY || packet10flying.y == Double.NEGATIVE_INFINITY) { if (Double.isNaN(packet10flying.y) || packet10flying.y == Double.POSITIVE_INFINITY || packet10flying.y == Double.NEGATIVE_INFINITY) {
player.teleport(player.getServer().getWorld(player.getWorld().getName()).getSpawnLocation()); player.teleport(player.getWorld().getSpawnLocation());
System.err.println(player.getName() + " was caught trying to set an invalid position."); System.err.println(player.getName() + " was caught trying to set an invalid position.");
player.kickPlayer("Nope!"); player.kickPlayer("Nope!");
return; return;
} }
if (Double.isNaN(packet10flying.z) || packet10flying.z == Double.POSITIVE_INFINITY || packet10flying.z == Double.NEGATIVE_INFINITY) { if (Double.isNaN(packet10flying.z) || packet10flying.z == Double.POSITIVE_INFINITY || packet10flying.z == Double.NEGATIVE_INFINITY) {
player.teleport(player.getServer().getWorld(player.getWorld().getName()).getSpawnLocation()); player.teleport(player.getWorld().getSpawnLocation());
System.err.println(player.getName() + " was caught trying to set an invalid position."); System.err.println(player.getName() + " was caught trying to set an invalid position.");
player.kickPlayer("Nope!"); player.kickPlayer("Nope!");
return; return;
} }
if (Double.isNaN(packet10flying.stance) || packet10flying.stance == Double.POSITIVE_INFINITY || packet10flying.stance == Double.NEGATIVE_INFINITY) { if (Double.isNaN(packet10flying.stance) || packet10flying.stance == Double.POSITIVE_INFINITY || packet10flying.stance == Double.NEGATIVE_INFINITY) {
player.teleport(player.getServer().getWorld(player.getWorld().getName()).getSpawnLocation()); player.teleport(player.getWorld().getSpawnLocation());
System.err.println(player.getName() + " was caught trying to set an invalid position."); System.err.println(player.getName() + " was caught trying to set an invalid position.");
player.kickPlayer("Nope!"); player.kickPlayer("Nope!");
return; return;
@ -209,7 +209,6 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
d4 = packet10flying.z; d4 = packet10flying.z;
} }
this.player.onGround = packet10flying.g;
this.player.a(true); this.player.a(true);
this.player.move(d5, 0.0D, d4); this.player.move(d5, 0.0D, d4);
this.player.setLocation(d1, d2, d3, f, f1); this.player.setLocation(d1, d2, d3, f, f1);
@ -330,9 +329,20 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.h = 0; this.h = 0;
} }
this.player.onGround = packet10flying.g; // CraftBukkit start
int coordX = (int)Math.floor(packet10flying.x);
int coordY = (int)Math.floor(packet10flying.y);
int coordZ = (int)Math.floor(packet10flying.z);
if (((Material)this.player.world.getMaterial(coordX, coordY - 1, coordZ)).isSolid()) {
this.player.onGround = true;
} else {
this.player.onGround = false;
}
this.minecraftServer.serverConfigurationManager.b(this.player); this.minecraftServer.serverConfigurationManager.b(this.player);
this.player.b(this.player.locY - d0, packet10flying.g); this.player.b(this.player.locY - d0, this.player.onGround);
// CraftBukkit end
} }
} }