Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
cfc098be BukkitValues was renamed ChunkBukkitValues (#4664)
63d6aac4 Updated Upstream (CraftBukkit) (#4663)
8319e912 Fix SafeNBTCopy#hasKey semantics
85eccb57 Don't assume that entries exist for SafeNBTCopy
595734a5 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#4659)
fa990d26 Revert "Updated Upstream (Bukkit/CraftBukkit/Spigot)"
23826a3f Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-10-17 16:03:14 -05:00
parent afed247113
commit 6b2b1373de
7 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -7,7 +7,7 @@ Makes it so that when a TileEntity is placed in the world and then broken,
the dropped ItemStack retains any original custom display name/lore.
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 4aa2b38f18..f863909992 100644
index 4aa2b38f1..f86390999 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -207,6 +207,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -74,7 +74,7 @@ index 4aa2b38f18..f863909992 100644
public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index bbb1de7d1a..d97efe3d47 100644
index bbb1de7d1..d97efe3d4 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -96,7 +96,24 @@ public class ItemBlock extends Item {
@@ -104,11 +104,11 @@ index bbb1de7d1a..d97efe3d47 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index d32540c88b..13460df026 100644
index 58d958a88..8e8749095 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper
this.persistentDataContainer.putAll(persistentDataTag);
this.persistentDataContainer.putAll((NBTTagCompound) persistentDataTag);
}
// CraftBukkit end
+ // Purpur start
@@ -160,7 +160,7 @@ index d32540c88b..13460df026 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b769a54fc3..400766dc76 100644
index b769a54fc..400766dc7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,7 @@ public class PurpurWorldConfig {