Pull the last upstream updates

This commit is contained in:
Aikar
2018-08-31 11:51:41 -04:00
parent db5a924b1c
commit c832bed57d
6 changed files with 6 additions and 6 deletions

View File

@@ -19,7 +19,7 @@ index 4b82e43a8..35fde8b23 100644
private final ItemCooldown bW;
@Nullable
diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
index 2842956bf..8aeded425 100644
index 26a366375..be43d9292 100644
--- a/src/main/java/net/minecraft/server/LoginListener.java
+++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable {