SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Relookup Entity Save ID if was null during precache
This commit is contained in:
Aikar
2018-07-27 00:44:53 -04:00
parent 9629d65220 3c8a4cb1bb
commit 817b9934c7
12 changed files with 66 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 6b8a1c8c8..e03965fc7 100644
index 0d54513a44..d8d519143e 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject {
@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
return TileEntityTypes.a.b(this.C()) + " // " + this.getClass().getCanonicalName();
});
if (this.world != null) {
@@ -23,7 +23,7 @@ index 6b8a1c8c8..e03965fc7 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e3c56a750..bfe09a205 100644
index e3c56a7506..bfe09a2055 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose