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

Update to 1.12.1

Browse Source
This commit is contained in:
BlackHole
2017-08-03 16:36:06 +02:00
parent 644f1e6e30
commit 01d1cc351b
64 changed files with 151 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/Fix-Old-Sign-Conversion.patch
View File

@@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
index d0f02f41..a8bc4b5f 100644
index cd6588de4..182936f2b 100644
--- a/src/main/java/net/minecraft/server/DefinedStructure.java
+++ b/src/main/java/net/minecraft/server/DefinedStructure.java
@@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -17,7 +17,7 @@ index d0f02f41..a8bc4b5f 100644
definedstructure_blockinfo1.c.setInt("y", blockposition1.getY());
definedstructure_blockinfo1.c.setInt("z", blockposition1.getZ());
+ tileentity.isLoadingStructure = true; // Paper
tileentity.a(definedstructure_blockinfo1.c);
tileentity.load(definedstructure_blockinfo1.c);
tileentity.a(definedstructureinfo.b());
tileentity.a(definedstructureinfo.c());
+ tileentity.isLoadingStructure = false; // Paper
@@ -34,7 +34,7 @@ index d0f02f41..a8bc4b5f 100644
public Iterator<IBlockData> iterator() {
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 6e23d325..ddea15cf 100644
index 393c9089d..237f7e6fe 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
@@ -46,7 +46,7 @@ index 6e23d325..ddea15cf 100644
private static final RegistryMaterials<MinecraftKey, Class<? extends TileEntity>> f = new RegistryMaterials();
protected World world;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 8bd12650..ba4f945a 100644
index 77a7b4458..54b719d91 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity {