Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eff22eb Ensure players are removed from pendingLogin

Pufferfish Changes:
pufferfish-gg/Pufferfish@31d0ff3 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4882a95 Fix PAPI edge-case
pufferfish-gg/Pufferfish@254c002 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@4b26a0b Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2c1e02e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@3888607 Update DAB entities
This commit is contained in:
BillyGalbreath
2022-08-29 12:33:47 -05:00
parent 7005356a4d
commit ef2160f5bf
34 changed files with 255 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0288-Remove-Timings.patch
View File

@@ -264,10 +264,10 @@ index 00a50196f6a4768d84acfbbeec79a0753308f091..30093cd8bd35f0bbc8f26eca370622ee
i = this.context.runTopCommand(function, source);
} finally {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 7875606264dc7bc2c4a0e8dfacecf07427c1d5a1..5a5c5a366e1156e1233efc04d0c0a6051170a4f5 100644
index 5de95ba778e4a0cd1467e7392aa80eda1bd21a03..0bfdc4247a651f6c1caf7a95114be68bc7d77d7b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -497,7 +497,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -496,7 +496,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
public void handleConsoleInputs() {
@@ -276,7 +276,7 @@ index 7875606264dc7bc2c4a0e8dfacecf07427c1d5a1..5a5c5a366e1156e1233efc04d0c0a605
// Paper start - use proper queue
ConsoleInput servercommand;
while ((servercommand = this.serverCommandQueue.poll()) != null) {
@@ -514,7 +514,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -513,7 +513,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// CraftBukkit end
}
@@ -769,10 +769,10 @@ index fdc9de253ae6d20b4df71fd6e6c1bb98ec753abf..5a800731927ca20e95fbcd0e8b94999e
this.entityManager.saveAll();
} else {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index cf24035eb1d145c2118d3ee57527f7cf9d2246fc..9dbd5c2e7d0c9bb26556ce32ced4c43ad9f3df0c 100644
index 0bc14bd2252705bd08ced10db3ed8dfbdc59893d..166fd17d03d84cd3ea5917c17e6b9549a46295e0 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2607,7 +2607,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2601,7 +2601,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -781,7 +781,7 @@ index cf24035eb1d145c2118d3ee57527f7cf9d2246fc..9dbd5c2e7d0c9bb26556ce32ced4c43a
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2617,7 +2617,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2611,7 +2611,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -790,7 +790,7 @@ index cf24035eb1d145c2118d3ee57527f7cf9d2246fc..9dbd5c2e7d0c9bb26556ce32ced4c43a
return;
}
@@ -2630,7 +2630,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2624,7 +2624,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {
@@ -800,10 +800,10 @@ index cf24035eb1d145c2118d3ee57527f7cf9d2246fc..9dbd5c2e7d0c9bb26556ce32ced4c43a
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index a6fe2e75b3c21a420432f33c9f5666fc558a06d1..cc09274fb3c3068ecd56e4c3c280b4fc876e628f 100644
index d9153b04b242e22d6e8894bfd45c92ea6466df00..1da509127582618d6ced45e6e8a310304e9ecc16 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1283,7 +1283,7 @@ public abstract class PlayerList {
@@ -1290,7 +1290,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
net.minecraft.server.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -812,7 +812,7 @@ index a6fe2e75b3c21a420432f33c9f5666fc558a06d1..cc09274fb3c3068ecd56e4c3c280b4fc
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1294,7 +1294,7 @@ public abstract class PlayerList {
@@ -1301,7 +1301,7 @@ public abstract class PlayerList {
}
// Paper end
}