From 159b3c8f645ebb66c8444730d7379f5125191187 Mon Sep 17 00:00:00 2001 From: MrFishCakes Date: Sun, 27 Aug 2023 00:46:45 +0100 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@1f42e8f Add configuration option to replace incompatible enchantments (#1419) PurpurMC/Purpur@8ef1580 Updated Upstream (Paper) --- gradle.properties | 2 +- patches/server/0008-Player-Skin-API.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 49bd691..bcbcc25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.graphitemc.graphite version = 1.20.1-R0.1-SNAPSHOT -purpurCommit = ad645dcbe80e6976a09d392d29d0e906d491bdb3 +purpurCommit = 8ef1580b1f5a1cd8dbd624b65fd4a8920ce52287 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0008-Player-Skin-API.patch b/patches/server/0008-Player-Skin-API.patch index b5bfcaf..480c568 100644 --- a/patches/server/0008-Player-Skin-API.patch +++ b/patches/server/0008-Player-Skin-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Player Skin API Ability to change a player's skin easily through new API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 018cf3cd424ac85e8d84179bc05ab241f0a00827..de46bf1e7c1b4611c75862028e433ed3d4eb4123 100644 +index 668d825a2469706e4de11629a0b41877de700ca6..71f62f10c51bb2e4d64e3989b5e26119ce2ea030 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3377,4 +3377,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3384,4 +3384,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket(getEntityId(), io.papermc.paper.adventure.PaperAdventure.asVanilla(message))); } // Purpur end