mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e51401e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347) PaperMC/Paper@51183af Fix console completer/highlighter having invalid source stack (#8346)
This commit is contained in:
@@ -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 9d8ed13f7bf6ff1bf2a3d1959687d12fa1073374..febc3b007a0486bdcd9abb2d8f8676f8f02bbdc0 100644
|
||||
index ce598d875fb2593349dadd9d41d745a8b288d561..0cf63861f3702524facd5e7ffe7da9e8b237d904 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2970,6 +2970,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||
@@ -2964,6 +2964,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||||
}
|
||||
|
||||
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
|
||||
@@ -95,7 +95,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 4180a1215daff7383acd9c77adb4e813ed9a4359..74bdd1a79dd3a911d3d4fb4b7a31454f64aa274a 100644
|
||||
index 76a80276e0634595954d976aab8f9b20c89b7227..3243c8aa7fc710d655f12de6e995d604710f2122 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user