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.
This update has not been tested by SapphireMC and as with ANY update, please do your own testing

Purpur Changes:
PurpurMC/Purpur@9e436f7 Updated Upstream (Paper)
PurpurMC/Purpur@235d507 Updated Upstream (Paper & Pufferfish)
PurpurMC/Purpur@890a9d7 inline Component import
PurpurMC/Purpur@8c8c18b Updated Upstream (Paper)
PurpurMC/Purpur@db11753 Fix NPE when no world given to explosions (#1286)
PurpurMC/Purpur@ea72a33 Update Rhino to 1.7.14 (#1285)
PurpurMC/Purpur@72b7579 Add option to fix creative mode actions with NetworkItemSerializeEvent (#1168)
PurpurMC/Purpur@67066cd [ci-skip] remove unused config option
  • Loading branch information
DenaryDev committed Mar 15, 2023
1 parent 4f85afd commit 48d079f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = io.sapphiremc.sapphire
version = 1.19.3-R0.1-SNAPSHOT
mcVersion = 1.19.3

purpurCommit = ef4b73ced7895d4760d66812b7c2e69680f1b646
purpurCommit = 67066cdd463e6e2d02dd26ec9418178d074abd41

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0002-Chromium-client-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ Subject: [PATCH] Chromium client support


diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 5ff9f0d9bc2bc08af251a677a8c98d6f288da8a8..980b00edffdda72d919ee833f7c65499a9d7ef5a 100644
index 9c03265a9e932b3c9b5f0f7ffb4c9e9094f813ec..9652f4b841b87750a4e9e8bdbb4cf9bf5e5d8338 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3113,4 +3113,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3104,4 +3104,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
void sendDeathScreen(@NotNull Component message, @Nullable Entity killer);
void sendDeathScreen(@NotNull net.kyori.adventure.text.Component message, @Nullable Entity killer);
// Purpur end
+
+ // Sapphire start
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0001-Rebrand.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand


diff --git a/build.gradle.kts b/build.gradle.kts
index b6fde7181a58037a2e2a6fd23daac9766127fc0e..5d9b68c75934c2c972d1367828dcd8aa6562af6a 100644
index 0435c1eb5c1fa6f9180ee8dc36a61afbac0f952e..b592f98a638ff82e905e729fa4a7f1e697ced4a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
Expand All @@ -17,7 +17,7 @@ index b6fde7181a58037a2e2a6fd23daac9766127fc0e..5d9b68c75934c2c972d1367828dcd8aa
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.19.3-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -84,7 +84,7 @@ tasks.jar {
@@ -85,7 +85,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
Expand All @@ -26,7 +26,7 @@ index b6fde7181a58037a2e2a6fd23daac9766127fc0e..5d9b68c75934c2c972d1367828dcd8aa
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -102,6 +102,7 @@ tasks.jar {
@@ -103,6 +103,7 @@ tasks.jar {
publishing {
publications.create<MavenPublication>("maven") {
artifact(tasks.shadowJar)
Expand Down Expand Up @@ -137,7 +137,7 @@ index 584596c8849b4dd7f955216f313eefb3229b375c..dd476926948f26f8e92d5991757238be
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 576cd8e20982bb20d10213b6c7a229428eec1c2f..f5a56c8322ac4fccb71d564a18693e2774be2949 100644
index 8a4c8701122edf2f29edbe97e4fa199da2744e9e..1dd306acaf08b090c0416508de69fdc2e81e1450 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -292,7 +292,7 @@ public class Main {
Expand Down
10 changes: 5 additions & 5 deletions patches/server/0008-Chromium-client-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ index b91bf50a1f450a78c8d16cf5b8772687120e9119..32e73857d1cbe20f9ebca8d6021dc41f
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 69463c7ca9995c02968bc2688adbe7131d91aa8b..839a9c1e7e95a92f910094c54a41d7e551e6106c 100644
index f5e1361c04d44ae7f82376aff6e5f01aaf45cfdd..8c28eaab3cb19dd89ab6807b3b13049e18f37c52 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3621,6 +3621,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3627,6 +3627,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
private static final ResourceLocation PURPUR_CLIENT = new ResourceLocation("purpur", "client"); // Purpur
+ private static final ResourceLocation CHROMIUM_CLIENT = new ResourceLocation("chromium", "client"); // Sapphire

@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3652,6 +3653,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3658,6 +3659,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
} catch (Exception ignore) {
}
// Purpur end
Expand All @@ -108,10 +108,10 @@ index 69463c7ca9995c02968bc2688adbe7131d91aa8b..839a9c1e7e95a92f910094c54a41d7e5
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4bce90ba8d2316fad9a8f89f06d17325d353667f..1153c4de670ee089321ed6925f4e0e302cad4d73 100644
index 08649f51adb40fa69d45b95c2d13aa918fff41bf..1932119d5dda63effb3cb81f33ac8ae60a0c57a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3190,4 +3190,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3205,4 +3205,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(packet);
}
// Purpur end
Expand Down

0 comments on commit 48d079f

Please sign in to comment.