Remove patch that was made obsolete by vanilla (#8847)

2023-02-13 17:52:27 +00:00 · 2023-02-13 17:52:27 +00:00 · f2f9e8cc4d
commit f2f9e8cc4d
parent 8d1acf68ed
908 changed files with 236 additions and 255 deletions
--- a/patches/server/0560-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0560-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 de10fe199af11525116081618609f7bfbc7b1006..5cc7edca158fed862d0dd18c6d2754de6df0ec4c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1186,6 +1186,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;
-         }