Updated Upstream (Bukkit/CraftBukkit) (#8991)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
2b4582fb SPIGOT-5916: getLastColors does not work with the rgb colors

CraftBukkit Changes:
f7707086d SPIGOT-7299: Fix indirect/anvil damage events and minor improvements
This commit is contained in:
Jake Potrebic 2023-03-18 10:05:04 -07:00 committed by GitHub
parent 79db3a2a4b
commit 5730a94208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
225 changed files with 36 additions and 70 deletions

View file

@ -186,10 +186,10 @@ index ecbcabc24529c7a7becf709fa6f24cfaa22f7f0e..bef819229c4d9c4742f907532f0d3f46
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 62c1f7b63601fc8df3469c0e7ad2d75382bde72f..a030a4852d0f7b2e3aedb7b35c316f525115086e 100644
index 427c63945e207236fc2e5caa99e22b3f7b171854..200c9694336f5670edef10693a82cbd89bd9b477 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1234,7 +1234,7 @@ public class CraftEventFactory {
@@ -1233,7 +1233,7 @@ public class CraftEventFactory {
public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
@ -198,7 +198,7 @@ index 62c1f7b63601fc8df3469c0e7ad2d75382bde72f..a030a4852d0f7b2e3aedb7b35c316f52
}
CraftServer server = player.level.getCraftServer();
@@ -1408,8 +1408,18 @@ public class CraftEventFactory {
@@ -1407,8 +1407,18 @@ public class CraftEventFactory {
return event;
}