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@c5c7609 Updated Upstream (Paper)
PurpurMC/Purpur@9690640 Updated Upstream (Paper)
PurpurMC/Purpur@20c48cd override the correct BlockPlayerDestroy method
PurpurMC/Purpur@ddc4fa9 Add configurable "sleep.not_possible" actionbar message (#1414)
PurpurMC/Purpur@8d384b0 Add option to always show item in player death messages (#1418)
PurpurMC/Purpur@cf23229 Updated Upstream (Paper)
PurpurMC/Purpur@ad645dc option to place end crystal on any block
  • Loading branch information
MrFishCakes committed Aug 23, 2023
1 parent c1b8a5c commit b9da362
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
group = org.graphitemc.graphite
version = 1.20.1-R0.1-SNAPSHOT

purpurCommit = aeecb71060e0ef279209ac7e14620cab6189c452
purpurCommit = ad645dcbe80e6976a09d392d29d0e906d491bdb3

org.gradle.caching = true
org.gradle.parallel = true
org.gradle.vfs.watch = false
org.gradle.jvmargs = -Xmx3G
org.gradle.jvmargs = -Xmx3G
4 changes: 2 additions & 2 deletions patches/api/0001-Graphite-Configuration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Graphite Configuration


diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 615c47f069d429e14993c60253f719b514849a67..5e242de3e52b3ac297f9b34c223ec1dd47e9b2a6 100644
index aaef58468a3c31f35e5067ed4263e9dd3fbddddd..c9fc7b84c9bc03caa01a5ce22d785f766c2022ba 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2092,7 +2092,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2132,7 +2132,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet.");
}
// Purpur end
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0004-Player-Skin-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Subject: [PATCH] Player Skin API
Ability to change a player's skin easily through new API

diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2e41fad4c033de003f89ab4ab549d2bf47ad7d4f..7800659b3f0caf64ddcff22dff512d94be7770a7 100644
index 9193288438671409cc3cf92033ef7cb60d798b69..8b5e87d0440c8d5a3bb446e0245e715d5697670b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1084,8 +1084,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
Expand All @@ -20,7 +20,7 @@ index 2e41fad4c033de003f89ab4ab549d2bf47ad7d4f..7800659b3f0caf64ddcff22dff512d94
* @see <a href="https://minecraft.fandom.com/wiki/End_Poem#Technical_details">https://minecraft.fandom.com/wiki/End_Poem#Technical_details</a>
*/
public void showWinScreen();
@@ -2704,7 +2704,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2730,7 +2730,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param simulationDistance the player's new simulation distance
*/
public void setSimulationDistance(int simulationDistance);
Expand All @@ -29,7 +29,7 @@ index 2e41fad4c033de003f89ab4ab549d2bf47ad7d4f..7800659b3f0caf64ddcff22dff512d94
/**
* Gets the no-ticking view distance for this player.
* <p>
@@ -3384,4 +3384,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3410,4 +3410,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0001-Graphite-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ index bdb32964524cb2a4398b8d3bedfb03b0cb805b6d..8f770b6d252f2ef6e8dc63c009301297
continue;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 60fbac7b09ba7de1127d53ba296ea7b843105b2a..d2bff98d1e2b137db9891f32703086c6d47b0fb7 100644
index b08d4a2a74392b1d59b1eeeab3108103d83ad96c..b2cac8043e2b006ab2f07e3672b0a0c3cd449def 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
Expand All @@ -162,10 +162,10 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..65dc12643d7533cbfa4813ce38baf353

if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index f03aba5c25896677d9d37e3fa010590b1ab7e3b6..b14ed650d37eba870829dc22a46d86bc2659c502 100644
index 3029f38cff6755b31427efb7fae3b6886ee8e4ee..2ce85ffaa3533c0e37a41c8a35cb0c7d1e055ccf 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -229,7 +229,7 @@ public class PurpurConfig {
@@ -231,7 +231,7 @@ public class PurpurConfig {
deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
}

Expand Down
6 changes: 3 additions & 3 deletions patches/server/0002-Graphite-Configuration.patch
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ index e471960e0443392f6f54732b052a4debf2a8fd97..19f1102de25054f2a8e7346c9ef78bc9
+ // Graphite end
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6afdf37406d7dae04a7fec94e0c39d5136521730..284f1e8c62eeb58b4265ed130c9c8aaa74fa461e 100644
index 99fd775e7a564aaef327a62bb7742da07b2d2829..3fae117993ed82ab59353852c8bdd952c19a6d28 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -307,6 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand Down Expand Up @@ -290,7 +290,7 @@ index 8f770b6d252f2ef6e8dc63c0093012978de565dc..b1a32fbfc51e4daa1ea36a4482c42ceb
+ // Graphite end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 34d38a8b80da3a8ab12df6d5051c4da653bba777..0a89b28f05fc8e99add630ea56eff8955bf40bfd 100644
index b2cac8043e2b006ab2f07e3672b0a0c3cd449def..e63fa71d64996aeb7df361872eacdf3541706ae9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -24,7 +24,6 @@ import java.io.FileNotFoundException;
Expand Down Expand Up @@ -325,7 +325,7 @@ index 34d38a8b80da3a8ab12df6d5051c4da653bba777..0a89b28f05fc8e99add630ea56eff895
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2985,6 +2985,12 @@ public final class CraftServer implements Server {
@@ -3015,6 +3015,12 @@ public final class CraftServer implements Server {
return getProperties().properties;
}
// Purpur end
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 8f7d6be9634f115159a216f818f12060244e70e2..5847504db7eb50b0d42a4b23b06f99011503b548 100644
index 018cf3cd424ac85e8d84179bc05ab241f0a00827..de46bf1e7c1b4611c75862028e433ed3d4eb4123 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3339,4 +3339,125 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3377,4 +3377,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 b9da362

Please sign in to comment.