Skip to content

Commit bc310d2

Browse files
committed
fix wrong absorb
1 parent 04a97aa commit bc310d2

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

paper-server/patches/features/0005-optimize-dirt-and-snow-spreading.patch

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] optimize dirt and snow spreading
55

66

77
diff --git a/net/minecraft/world/level/block/SpreadingSnowyBlock.java b/net/minecraft/world/level/block/SpreadingSnowyBlock.java
8-
index f9cf473ec2b51d82e01ba020196cc2bc92d345b4..f868b1ccfa0e373c47344d000f26fbe8507c3510 100644
8+
index 6695d7f76daf45ed3e73c4984326b8b59e5a76cc..f868b1ccfa0e373c47344d000f26fbe8507c3510 100644
99
--- a/net/minecraft/world/level/block/SpreadingSnowyBlock.java
1010
+++ b/net/minecraft/world/level/block/SpreadingSnowyBlock.java
1111
@@ -27,8 +27,13 @@ public abstract class SpreadingSnowyBlock extends SnowyBlock {
@@ -39,7 +39,7 @@ index f9cf473ec2b51d82e01ba020196cc2bc92d345b4..f868b1ccfa0e373c47344d000f26fbe8
3939
}
4040

4141
@Override
42-
@@ -50,9 +61,16 @@ public abstract class SpreadingSnowyBlock extends SnowyBlock {
42+
@@ -50,7 +61,14 @@ public abstract class SpreadingSnowyBlock extends SnowyBlock {
4343
Registry<Block> blocks = level.registryAccess().lookupOrThrow(Registries.BLOCK);
4444
Optional<Block> baseBlock = blocks.getOptional(this.baseBlock);
4545
if (!baseBlock.isEmpty()) {
@@ -53,11 +53,8 @@ index f9cf473ec2b51d82e01ba020196cc2bc92d345b4..f868b1ccfa0e373c47344d000f26fbe8
5353
+ if (!canStayAlive(cachedChunk, state, pos)) {
5454
+ // Paper end - Perf: optimize dirt and snow spreading
5555
// CraftBukkit start
56-
- if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
57-
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, baseBlock.get().defaultBlockState()).isCancelled()) {
56+
if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, baseBlock.get().defaultBlockState()).isCancelled()) {
5857
return;
59-
}
60-
// CraftBukkit end
6158
@@ -63,8 +81,20 @@ public abstract class SpreadingSnowyBlock extends SnowyBlock {
6259

6360
for (int i = 0; i < 4; i++) {

paper-server/patches/sources/net/minecraft/world/level/block/SpreadingSnowyBlock.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
if (!baseBlock.isEmpty()) {
1111
if (!canStayAlive(state, level, pos)) {
1212
+ // CraftBukkit start
13-
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
13+
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(level, pos, baseBlock.get().defaultBlockState()).isCancelled()) {
1414
+ return;
1515
+ }
1616
+ // CraftBukkit end

0 commit comments

Comments
 (0)