Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 02:49:10 +00:00
Code Issues Releases Activity

Update 1.18.2

Browse Source
This commit is contained in:
violetc
2022-03-05 13:09:53 +08:00
parent 4b0c53ad3d
commit 36c527e841
9 changed files with 57 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0004-Fix-gravity-block-duper.patch
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 4584dcec835f97e94dcf12788b66703075dafe45..a5d2f07881761bb7a00a05d5767abf177ea2837d 100644
index 84fce7dccf9232209f939a32acfc3131e62eb27c..cbe48b0add7134100c3da87c07ecee36cef8c69d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -395,36 +395,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -398,36 +398,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
// Paper end - optimise entity tracking
@@ -46,7 +46,7 @@ index 4584dcec835f97e94dcf12788b66703075dafe45..a5d2f07881761bb7a00a05d5767abf17
// Paper start
/**
@@ -2767,7 +2739,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -2801,7 +2773,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
}
this.processPortalCooldown();
@@ -56,10 +56,10 @@ index 4584dcec835f97e94dcf12788b66703075dafe45..a5d2f07881761bb7a00a05d5767abf17
}
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 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..ef147a7dc3d233e33435d94e238619e749f9704d 100644
index c267bc75a5a2a410d941accbe8c41e3422a634a5..dd03e377d03d82dff4719da23dacc3878b8b94ea 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -110,11 +110,7 @@ public class FallingBlockEntity extends Entity {
@@ -119,11 +119,7 @@ public class FallingBlockEntity extends Entity {
@Override
public void tick() {
@@ -71,8 +71,8 @@ index 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..ef147a7dc3d233e33435d94e238619e7
+ // Leaves - fix gravity block duper
if (this.blockState.isAir()) {
this.discard();
} else if (this.level.isClientSide && this.removeAtMillis > 0L) {
@@ -152,11 +148,7 @@ public class FallingBlockEntity extends Entity {
} else {
@@ -136,11 +132,7 @@ public class FallingBlockEntity extends Entity {
this.move(MoverType.SELF, this.getDeltaMovement());