Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6209)

This commit is contained in:
Jake Potrebic 2021-07-16 18:48:27 -07:00 committed by GitHub
parent a5acf367a3
commit 7f89e96357
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 158 additions and 158 deletions

View file

@ -122,10 +122,10 @@ index b9b67134f02fd7484ed19905c9ae1f9b8a26ce26..c05f173b7642380900fdd77ce5d2c020
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c2ddbde78c861c33f25c63483fc8928307161f1a..b4509c4a03b82d7c49329aa74087818499430e58 100644
index c8c3a8d8e4e5e7df66b69011ad95bb6bd6d3b6ee..1ab0c25dabd19dd53f255b76b2a5c85399cffaaf 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1466,8 +1466,10 @@ public class CraftEventFactory {
@@ -1481,8 +1481,10 @@ public class CraftEventFactory {
return itemInHand;
}