mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Rebuild patches
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From 7f873f7c3df6734b6ee43eb3b0514545b4f88de0 Mon Sep 17 00:00:00 2001
|
||||
From: jmp <jasonpenilla2@me.com>
|
||||
Date: Wed, 30 Sep 2020 14:32:46 -0700
|
||||
Subject: [PATCH] Persistent TileEntity Lore and DisplayName
|
||||
@@ -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 d621b11ba..c276a2896 100644
|
||||
index d621b11ba9029a732a819e0558d6f8a439990dbe..c276a2896ba73d86e7e18d656903b36d2970ac41 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -207,7 +207,7 @@ public class Block extends BlockBase implements IMaterial {
|
||||
@@ -79,7 +79,7 @@ index d621b11ba..c276a2896 100644
|
||||
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
|
||||
float f = 0.5F;
|
||||
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
|
||||
index bbb1de7d1..d97efe3d4 100644
|
||||
index bbb1de7d1adce6e986467db234b27518df4dd87f..d97efe3d4765dcae50afae49d252e710c056337f 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 {
|
||||
@@ -109,7 +109,7 @@ index bbb1de7d1..d97efe3d4 100644
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
||||
index 58d958a88..8e8749095 100644
|
||||
index 58d958a88ac5af5b889d719d9f1ea90ce45cf184..8e8749095427b44e04582593114cae8cf6d00f42 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
|
||||
@@ -165,7 +165,7 @@ index 58d958a88..8e8749095 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index f04e2e562..4d97a2323 100644
|
||||
index f04e2e562fb07ca0f1b4ac4e25fdb050554b5431..4d97a232351a2a70f8992ff1d8d93b1fb976029a 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -182,6 +182,7 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user