Update Upstream

This commit is contained in:
Spottedleaf
2019-05-05 19:58:04 -07:00
parent 52cd8744e0
commit f9f71eb14e
321 changed files with 809 additions and 856 deletions

View File

@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
should be covered as best we can.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
index 24b06a0b7e..294f3de00c 100644
index 6a448c02ec..c1ef1c950d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -0,0 +0,0 @@ import org.bukkit.plugin.Plugin;
@@ -59,5 +59,5 @@ index 24b06a0b7e..294f3de00c 100644
+ return new File(getStorageLazy().getPlayerDir(), getUniqueId() + ".dat");
}
public long getFirstPlayed() {
@Override
--