Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update leaf's exploit fixes

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-14 16:34:43 -05:00
parent 84d5283bab
commit b8959e4416
7 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0126-PaperPR-Fix-sand-duping.patch
View File

@@ -1,4 +1,4 @@
From b1189325f8f73cd7f91a349a2b28ccef384c2f87 Mon Sep 17 00:00:00 2001
From c6f6d063de2c8a20138143945b79f879adf2be87 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 12 Jun 2020 13:33:19 -0700
Subject: [PATCH] PaperPR - Fix sand duping
@@ -10,18 +10,18 @@ to detect that by placing a check after the move.
1 file changed, 11 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index 6683f7c5f3..243a8c570d 100644
index 6683f7c5f3..7969b1cd57 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -64,6 +64,11 @@ public class EntityFallingBlock extends Entity {
@Override
public void tick() {
+ // Paper start - fix sand duping
+ // Purpur start - fix sand duping
+ if (this.dead) {
+ return;
+ }
+ // Paper end - fix sand duping
+ // Purpur end - fix sand duping
if (this.block.isAir()) {
this.die();
} else {
@@ -29,11 +29,11 @@ index 6683f7c5f3..243a8c570d 100644
this.move(EnumMoveType.SELF, this.getMot());
+ // Paper start - fix sand duping
+ // Purpur start - fix sand duping
+ if (this.dead) {
+ return;
+ }
+ // Paper end - fix sand duping
+ // Purpur end - fix sand duping
+
// Paper start - Configurable EntityFallingBlock height nerf
if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY() > this.world.paperConfig.fallingBlockHeightNerf) {