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

Paper Changes:
PaperMC/Paper@3ea95ef Do not access world state to see if we can see a Player
  • Loading branch information
granny committed Feb 23, 2024
1 parent 9cd8eb4 commit 8f4b0ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 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 = org.purpurmc.purpur
version = 1.20.4-R0.1-SNAPSHOT

mcVersion = 1.20.4
paperCommit = 4939f8711884901ddf1c56337f606de71cdae78d
paperCommit = 3ea95efdebba7254e842dec66214f71de4721993

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0008-Ridables.patch
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ index d39a3359249e2a312da0645d5abb625d98fe4034..44409eed0b603a1e8203a35ff0263d36

public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 90910646031a73e1254fb844efdb9c8e32ec4233..88eaf67ee621e06025f23657fe870cc2c9cb9b8f 100644
index 601ac8738a775eafde2c9e237feb596a9a47ba89..7f73d724af2c468a06dcfd760a70b8d6bd9ac31a 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2718,6 +2718,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2722,6 +2722,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0072-Entity-lifespan.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan


diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 39950e314ee9373c9b2a7a70dac1977ee7a303bf..17d3d4caa010c97d0c78f6286140cb44c75a8b40 100644
index 1cc86f8dd63802b7227de56b44c859c253a80756..b9a4815d6f942d78851213224a475b154c264d86 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2745,6 +2745,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2749,6 +2749,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
AABB axisalignedbb = entity.getBoundingBox();

if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0275-Add-item-packet-serialize-event.patch
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ index 8384f72d408f6f31c4c8a1ba47b8caba600faaad..b1dd8d66a524254a270a725f5f7a46f2
while (iterator.hasNext()) {
ServerLevel worldserver = (ServerLevel) iterator.next();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4cb24be39cdb223cfeb34c102bdc707f3850033b..b7803d6753d28f174b8a6e5b31eccfa44b94c6be 100644
index 921e04a0280dde21ee5af79188052294d30a0bbc..ae5a2152cde8922deeb8d1d8a85bf39518ccd759 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3365,6 +3365,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -3369,6 +3369,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
}
}
Expand Down

0 comments on commit 8f4b0ae

Please sign in to comment.