From b3b488f568b40099609d609c0bc8a2daac37d48e Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 16 Mar 2023 10:07:12 +0100
Subject: [PATCH] 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
---
 ...nge-Interaction-attack-damage-source.patch | 19 +++++++++++++++++++
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 patches/server/Dont-change-Interaction-attack-damage-source.patch

diff --git a/patches/server/Dont-change-Interaction-attack-damage-source.patch b/patches/server/Dont-change-Interaction-attack-damage-source.patch
new file mode 100644
index 000000000..ac18bd517
--- /dev/null
+++ b/patches/server/Dont-change-Interaction-attack-damage-source.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Thu, 16 Mar 2023 10:04:17 +0100
+Subject: [PATCH] Dont change Interaction attack damage source
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Interaction.java b/src/main/java/net/minecraft/world/entity/Interaction.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/Interaction.java
++++ b/src/main/java/net/minecraft/world/entity/Interaction.java
+@@ -0,0 +0,0 @@ public class Interaction extends Entity implements Attackable, Targeting {
+             if (entityhuman instanceof ServerPlayer) {
+                 ServerPlayer entityplayer = (ServerPlayer) entityhuman;
+ 
+-                CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, source, (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit
++                CriteriaTriggers.PLAYER_HURT_ENTITY.trigger(entityplayer, this, entityhuman.damageSources().generic(), (float) event.getFinalDamage(), 1.0F, false); // CraftBukkit // Paper
+             }
+ 
+             return !this.getResponse();
diff --git a/work/Bukkit b/work/Bukkit
index 3a54fb167..2651717c7 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 3a54fb167d6354b6e39f5027bcde56641f487b8f
+Subproject commit 2651717c7d47696a774dfbe3ba1db6c6cfb8a4c5
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 55056ad80..dbc32ffa0 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 55056ad80314cca1c910c9b79f31a1b6a4c629f6
+Subproject commit dbc32ffa0667ee6d02771283f19c7ccf8c965563