More more more more more more more more more more more more more more more more more work

2021-11-25 10:19:05 +01:00 · 2021-11-25 10:19:05 +01:00 · dabbf5b193
commit dabbf5b193
parent 011df7dc84
374 changed files with 427 additions and 472 deletions
--- a/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch
@ -1,22 +0,0 @@
-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 820e634abadca014baf11387865118e834859f7a..d7bcab2d3830ccd807b0d021d71db2e2fae0c6d0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1167,6 +1167,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;
-         }