Fix VanillaGoals when in reobfuscated environment (#6580)

2021-09-09 11:57:16 -05:00 · 2021-09-09 11:57:16 -05:00 · 1b383d7e9b
commit 1b383d7e9b
parent c3d50184eb
285 changed files with 108 additions and 211 deletions
--- a/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0613-Reset-shield-blocking-on-dimension-change.patch
@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yive <admin@yive.me>
+Date: Sun, 24 Jan 2021 08:55:19 -0800
+Subject: [PATCH] Reset shield blocking on dimension change
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 92f16e89d19543725f64cbcbd2db5fcf507ea51a..d044ceb467621f3ddc2fd1471648d03fe4e1ec85 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -1143,6 +1143,11 @@ public class ServerPlayer extends Player {
+                 this.level.getCraftServer().getPluginManager().callEvent(changeEvent);
+                 // CraftBukkit end
+             }
+            // Paper start
+            if (this.isBlocking()) {
+                this.stopUsingItem();
+            }
+            // Paper end
+ 
+             return this;
+         }