Update to 1.8.4

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-05-05 21:43:47 +01:00
parent ed8ca79a65
commit 38b1bb1aef
24 changed files with 270 additions and 287 deletions

View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/PacketStatusListener.java 2015-02-26 22:40:22.927608136 +0000
+++ src/main/java/net/minecraft/server/PacketStatusListener.java 2015-02-26 22:40:22.927608136 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/PacketStatusListener.java 2015-05-05 21:53:39.601104451 +0100
+++ src/main/java/net/minecraft/server/PacketStatusListener.java 2015-05-05 21:53:39.601104451 +0100
@@ -1,5 +1,16 @@
package net.minecraft.server;
@@ -29,8 +29,8 @@
+ // CraftBukkit end
+
public void a(PacketStatusInStart packetstatusinstart) {
- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aF()));
+ // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aF()));
- this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ // this.networkManager.handle(new PacketStatusOutServerInfo(this.minecraftServer.aG()));
+ // CraftBukkit start - fire ping event
+ if (state != WAITING) {
+ networkManager.close(null);