Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c029645 Don't allow world unloading while ticking worlds (fixes #8080) (#8081)
PaperMC/Paper@9d0650e Don't print component in resource pack rejection message (#8084)
This commit is contained in:
BillyGalbreath
2022-07-03 04:11:37 -05:00
parent e7d3f0741a
commit 959d211f48
7 changed files with 13 additions and 13 deletions

View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = a22eb678af9555e7f55a03d397178e8b87d7c1ca
paperCommit = 9d0650ed601df789c129eb06160627d117922941
org.gradle.caching = true
org.gradle.parallel = true

View File

@@ -105,7 +105,7 @@ index 8bae26d296eb73642fa1a2f83ec1a28fadcade0c..2f98c6a031a4e08c8395c326d35b129c
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8911766b8e7d4d30765cafe1533134d356bf60db..bad6344243358df99fac031b0fab021493b733a1 100644
index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d93eb184f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index 8911766b8e7d4d30765cafe1533134d356bf60db..bad6344243358df99fac031b0fab0214
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2721,6 +2724,18 @@ public final class CraftServer implements Server {
@@ -2722,6 +2725,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

View File

@@ -17,10 +17,10 @@ index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bad6344243358df99fac031b0fab021493b733a1..5fcd5c23755773613ca7a2926a60327d36c08b51 100644
index cc779a1a5b11a92366fd04585369e0d93eb184f4..317ec55ac02deb9e88fa658f2eaa150409c12127 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2911,4 +2911,11 @@ public final class CraftServer implements Server {
@@ -2912,4 +2912,11 @@ public final class CraftServer implements Server {
}
// Paper end

View File

@@ -25,10 +25,10 @@ index 781da79fb246b8d4263ede4d8d5cc22090d9e4ba..6f7326c26e900a96ab119e5ee0f06991
}
// Spigot end
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5fcd5c23755773613ca7a2926a60327d36c08b51..50be028e6f14edbc0aef70a2ed33fa1cb9221101 100644
index 317ec55ac02deb9e88fa658f2eaa150409c12127..2dc8d141f20787981ede3a27b5683408142a7c1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2917,5 +2917,10 @@ public final class CraftServer implements Server {
@@ -2918,5 +2918,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return this.getProperties().serverName;
}

View File

@@ -82,7 +82,7 @@ index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbd
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c48b44129881d864cca6254b222d0ecbb7d78bcf..474944b20fb81e9e4ed42ec2895673c98bc36420 100644
index 250182281905fd9f02491a5dcd03cd3091a80029..770585c0ba9db619941b2562b34371cc1d167cb8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2003,12 +2003,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -97,7 +97,7 @@ index c48b44129881d864cca6254b222d0ecbb7d78bcf..474944b20fb81e9e4ed42ec2895673c9
+ }
+ // Purpur end
if (packet.getAction() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getName());
ServerGamePacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack rejection", this.player.getGameProfile().getName()); // Paper - Don't print component in resource pack rejection message
this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"), org.bukkit.event.player.PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION); // Paper - add cause
}
// Paper start

View File

@@ -69,10 +69,10 @@ index 9fe2178e3d38674a1be54a54ec6056145dc68859..1926be61107787f534d7f9b013396841
lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 50be028e6f14edbc0aef70a2ed33fa1cb9221101..8dab71441586d5afb62b8f1b838205fecea408d6 100644
index 2dc8d141f20787981ede3a27b5683408142a7c1f..787fa6e886c9cb9cadee15d5481ff75fbf47ec1a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2678,6 +2678,7 @@ public final class CraftServer implements Server {
@@ -2679,6 +2679,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

View File

@@ -51,10 +51,10 @@ index c617a8aacbbefb37d53d0e005e822469d29aa642..e1abe61edfaa7b1497b5367310b49146
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8dab71441586d5afb62b8f1b838205fecea408d6..73981c17b2581513f1de4682d75a1fe10b79a3af 100644
index 787fa6e886c9cb9cadee15d5481ff75fbf47ec1a..0b45cfd7158af615df3f9477a8891e495c69a4fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1416,6 +1416,19 @@ public final class CraftServer implements Server {
@@ -1417,6 +1417,19 @@ public final class CraftServer implements Server {
return true;
}