Skip to content

Commit

Permalink
Updated Upstream (Purpur)
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
MrFishCakes committed Aug 26, 2023
1 parent de192d0 commit 159b3c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0008-Player-Skin-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 159b3c8

Please sign in to comment.