Skip to content

Commit

Permalink
Updated Upstream (Paper)
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

Paper Changes:
PaperMC/Paper@22ac7d6 Add internal netty pipeline events
PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit)
PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
  • Loading branch information
DenaryDev committed Jul 26, 2022
1 parent f9e4a25 commit b10c377
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 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-R0.1-SNAPSHOT

mcVersion=1.19
paperRef=b327e17634db1798ad854300dac85107e7fb7b73
paperRef=86f87ba40030d719e5fb8840ab18c513588de772

org.gradle.caching=true
org.gradle.parallel=true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0010-Chromium-client-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Chromium client support


diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 353463084d90eb684717e65c56da52cd25a1e375..4e8cb41cc82b1553f7a9c84e44b28ed5013abbdb 100644
index 5f0d934399991ae94795ad0a94da689c242ffeba..01eeeb4437498512724d476fda000c53965fe53c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
public Integer clientViewDistance;
// CraftBukkit end
public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
Expand Down
12 changes: 6 additions & 6 deletions patches/server/0012-Entity-dismount-reason-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ index 938f70ed76d7e32250be23769a11e1b69b80eadb..e2c64880c485ca728a730fb321ce0d60
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4e8cb41cc82b1553f7a9c84e44b28ed5013abbdb..04117823f0084c51df809363134c24a1b1df76dd 100644
index 01eeeb4437498512724d476fda000c53965fe53c..6e0639bb0df56960550ac80dd148bdaded257cec 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1682,10 +1682,11 @@ public class ServerPlayer extends Player {
@@ -1683,10 +1683,11 @@ public class ServerPlayer extends Player {

public void disconnect() {
this.disconnected = true;
Expand All @@ -55,15 +55,15 @@ index 4e8cb41cc82b1553f7a9c84e44b28ed5013abbdb..04117823f0084c51df809363134c24a1
this.stopRiding();
}
// Paper end
@@ -1844,6 +1845,7 @@ public class ServerPlayer extends Player {
@@ -1845,6 +1846,7 @@ public class ServerPlayer extends Player {
this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId()));
if (gameMode == GameType.SPECTATOR) {
this.removeEntitiesOnShoulder();
+ this.dismountReason = org.spigotmc.event.entity.EntityDismountEvent.DismountReason.SPECTATE; // Sapphire
this.stopRiding();
} else {
this.setCamera(this);
@@ -2042,7 +2044,7 @@ public class ServerPlayer extends Player {
@@ -2043,7 +2045,7 @@ public class ServerPlayer extends Player {

if (entity != this) {
// Make sure we're in the right place
Expand All @@ -72,7 +72,7 @@ index 4e8cb41cc82b1553f7a9c84e44b28ed5013abbdb..04117823f0084c51df809363134c24a1
this.getBukkitEntity().teleport(new Location(entity.getCommandSenderWorld().getWorld(), entity.getX(), entity.getY(), entity.getZ(), this.getYRot(), this.getXRot()), TeleportCause.SPECTATE); // Correctly handle cross-world entities from api calls by using CB teleport

// Make sure we're tracking the entity before sending
@@ -2110,6 +2112,7 @@ public class ServerPlayer extends Player {
@@ -2111,6 +2113,7 @@ public class ServerPlayer extends Player {
public void teleportTo(ServerLevel worldserver, double d0, double d1, double d2, float f, float f1, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause) {
// CraftBukkit end
this.setCamera(this);
Expand All @@ -93,7 +93,7 @@ index 20cdfdb3b9351f74e89bc45b3ab972384165659a..efda6c6064f4cd07926ec7c11941be22
entity.getPassengersAndSelf().forEach((entity1) -> {
// Paper start
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 76b9beb0d8ebeee0f603d2740ba71beabbf19e25..f35688e2843851c5577b004d88fa3bdee35fb7d7 100644
index 99f454b4a3a12fb9bf8e1d506ab311e4166700da..f977be90ee986984bdf39aa1ef2c2728debc445c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -540,6 +540,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
Expand Down

0 comments on commit b10c377

Please sign in to comment.