diff options
| author | Nassim Jahnke <[email protected]> | 2024-01-24 13:07:40 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-01-24 13:42:24 +0100 |
| commit | ad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3 (patch) | |
| tree | d3dd57ebed22efd67c5917db75258a201265a64a /patches/server/0908-Only-capture-actual-tree-growth.patch | |
| parent | 51bef80755a18eb3fa58ba42b1926174d5e7a76d (diff) | |
| download | Paper-ad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3.tar.gz Paper-ad2cf68a7fb98f1ecdb766cc5a69ab86953a21f3.zip | |
[ci skip] Move chunk system patch back a bit
Diffstat (limited to 'patches/server/0908-Only-capture-actual-tree-growth.patch')
| -rw-r--r-- | patches/server/0908-Only-capture-actual-tree-growth.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/patches/server/0908-Only-capture-actual-tree-growth.patch b/patches/server/0908-Only-capture-actual-tree-growth.patch index 56ff55e087..e513b361e9 100644 --- a/patches/server/0908-Only-capture-actual-tree-growth.patch +++ b/patches/server/0908-Only-capture-actual-tree-growth.patch @@ -29,10 +29,10 @@ index e14d928e8bf484c61f2687621623942a27f30db1..0fd5decb0790423aba80a7c1e55ce39a } entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index f4db64595f4434c9225923390c4fe7d7e0af6d26..a63beddef78967d13add0e62a97f03ec82f3fcc0 100644 +index 6bd2c70b1bfe27b22cbe5ac2ed1bba3dc4e6cd7d..7c57ffa9eb3a80977ed1cbc109bbaeeceb89fb94 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1403,4 +1403,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1361,6 +1361,16 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent } // Paper end - respect global sound events gamerule @@ -46,7 +46,9 @@ index f4db64595f4434c9225923390c4fe7d7e0af6d26..a63beddef78967d13add0e62a97f03ec + } + } + // Paper end - notify observers even if grow failed - } + // Paper start + //protected final io.papermc.paper.world.EntitySliceManager entitySliceManager; // Paper - rewrite chunk system + diff --git a/src/main/java/net/minecraft/world/level/block/SaplingBlock.java b/src/main/java/net/minecraft/world/level/block/SaplingBlock.java index 7e6ee9c1ccef3eaa6b2edc39e414bd186426aee5..836c86104ed4f0d375330c9123af5d502efefa4d 100644 --- a/src/main/java/net/minecraft/world/level/block/SaplingBlock.java |