Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-23 08:59:23 +00:00
Code Issues Releases Activity

Readd Petal's Reduce sensor work patch

Browse Source
This commit is contained in:
Dreeam
2023-06-16 12:52:26 +08:00
parent 08067f6e74
commit 780b82fa30
12 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/server/0020-Petal-Reduce-sensor-work.patch → patches/server/0019-Petal-Reduce-sensor-work.patch
View File

0
patches/server/0021-Akarin-Save-Json-list-asynchronously.patch → patches/server/0020-Akarin-Save-Json-list-asynchronously.patch
View File

0
patches/server/0022-Slice-Smooth-Teleports.patch → patches/server/0021-Slice-Smooth-Teleports.patch
View File

0
patches/server/0023-PaperPR-Optimize-VarInts.patch → patches/server/0022-PaperPR-Optimize-VarInts.patch
View File

0
patches/server/0024-Parchment-Make-FixLight-use-action-bar.patch → patches/server/0023-Parchment-Make-FixLight-use-action-bar.patch
View File

0
patches/server/0025-Leaves-Server-Utils.patch → patches/server/0024-Leaves-Server-Utils.patch
View File

0
patches/server/0026-Leaves-Jade-Protocol.patch → patches/server/0025-Leaves-Jade-Protocol.patch
View File

0
patches/server/0027-Leaves-Appleskin-Protocol.patch → patches/server/0026-Leaves-Appleskin-Protocol.patch
View File

0
patches/server/0028-Leaves-Xaero-Map-Protocol.patch → patches/server/0027-Leaves-Xaero-Map-Protocol.patch
View File

0
patches/server/0029-Fix-Make-log4j-compatible-with-future-release.patch → patches/server/0028-Fix-Make-log4j-compatible-with-future-release.patch
View File

0
patches/server/0030-Fix-compile-error.patch → patches/server/0029-Fix-compile-error.patch
View File

17
patches/server/0019-Petal-reduce-work-done-by-game-event-system.patch → patches/unapplied/server/0019-Petal-reduce-work-done-by-game-event-system.patch
View File

@@ -10,21 +10,8 @@ Original project: https://github.com/Bloom-host/Petal
2. EuclideanGameEventListenerRegistry is not used concurrently so we ban that usage for improved performance with allays 2. EuclideanGameEventListenerRegistry is not used concurrently so we ban that usage for improved performance with allays
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..fe0dfa85d0e2edb7f2c3b3a12bb9aa651e7ea852 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -193,7 +193,7 @@ public abstract class BlockEntity {
return new CompoundTag();
}
- public boolean isRemoved() {
+ public static boolean isRemoved() {
return this.remove;
}
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
index a606aed406551f4d3cc0bf09d6e231d87fe00f53..64bb89ff273d73d54dbced93f66a0c73c418adf7 100644 index a606aed406551f4d3cc0bf09d6e231d87fe00f53..01babdf2c82d019589c38b73a10ad7afeebd32d2 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkCatalystBlockEntity.java
@@ -126,6 +126,13 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi @@ -126,6 +126,13 @@ public class SculkCatalystBlockEntity extends BlockEntity implements GameEventLi
@@ -34,7 +21,7 @@ index a606aed406551f4d3cc0bf09d6e231d87fe00f53..64bb89ff273d73d54dbced93f66a0c73
+ // petal start + // petal start
+ @Override + @Override
+ public boolean listensToEvent(GameEvent gameEvent, GameEvent.Context context) { + public boolean listensToEvent(GameEvent gameEvent, GameEvent.Context context) {
+ return !isRemoved() && gameEvent == GameEvent.ENTITY_DIE && context.sourceEntity() instanceof LivingEntity; + return !this.isRemoved() && gameEvent == GameEvent.ENTITY_DIE && context.sourceEntity() instanceof LivingEntity;
+ } + }
+ // petal end + // petal end
+ +