9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-31 04:46:29 +00:00

Start 1.20

This commit is contained in:
violetc
2023-06-10 12:47:52 +08:00
parent 48d4542cc3
commit 6cbeac7802
50 changed files with 304 additions and 371 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8544ee07fa72f848e330697823233a201f8cd052..62e90767096b8998253d4bde99ec7968bd079529 100644
index ec3f1227ad3cd1469258cabe9a36caaf605151d9..39a65a784c9051d183a62291c01240034c86dd70 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -514,36 +514,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -519,36 +519,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
// Paper end - optimise entity tracking
@@ -46,7 +46,7 @@ index 8544ee07fa72f848e330697823233a201f8cd052..62e90767096b8998253d4bde99ec7968
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
@@ -2952,7 +2924,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3073,7 +3045,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();
@@ -56,7 +56,7 @@ index 8544ee07fa72f848e330697823233a201f8cd052..62e90767096b8998253d4bde99ec7968
}
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 536856300da929c101f50da5827677bada5feb50..5537ee2c32367ad253f4fdad5d9e74980013153f 100644
index eff81e846f696349b3bd3d26c02442f157b169f0..0352808f4b2783e7f941c6224f5929b98b95d51e 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -64,7 +64,7 @@ public class FallingBlockEntity extends Entity {
@@ -93,7 +93,7 @@ index 536856300da929c101f50da5827677bada5feb50..5537ee2c32367ad253f4fdad5d9e7498
+ // Leaves - fix gravity block duper
// Paper start - Configurable EntityFallingBlock height nerf
if (this.level.paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
index 41d7cff39fc37955877668337689b4b26cd8c7cf..5e0e8afa553a8dcd87dfc10a595ba10c2b3da7df 100644
--- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java