Updated Upstream (Bukkit/CraftBukkit)

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:
2651717c SPIGOT-7292: Support for alpha channel in Color and a few improvements

CraftBukkit Changes:
dbc32ffa0 SPIGOT-7292: Support alpha channel in Display entities
cef8bd993 SPIGOT-7294: Call EntityDamageEvent for Interaction entity
This commit is contained in:
Nassim Jahnke 2023-03-16 10:07:12 +01:00
commit fe881073af
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
12 changed files with 44 additions and 25 deletions

View file

@ -18,10 +18,10 @@ index 5391c60398c8a7d1d49dc2e73116b27862653873..5a79b49e321cba352d8e4189dfbfdd05
--this.count;
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 8451c482eb92e7f9394490c9380cd1d6357306dc..6bb518a2d9610157b48209241f98c29b1f80158d 100644
index f1e0cc9b558fd825e6ef1bd26ccec488153fd21d..f80f015515e4da9bf9d41f7bc38341c018c90acc 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1117,6 +1117,17 @@ public class CraftEventFactory {
@@ -1121,6 +1121,17 @@ public class CraftEventFactory {
return event;
}