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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@a15152e Allow old behavior for CommandRegisteredEvent (#8249)
PaperMC/Paper@0118c0b Improve MojangAPI docs and replace @Deprecated with @ApiStatus.Experimental on draft APIs (#8261)
PaperMC/Paper@3624637 Improve documentation of Inventory#removeItem (#8263)
PaperMC/Paper@a47301e Fix Player#chat kicking all clients (#8262)
PaperMC/Paper@78b19f8 Separate Command Sending to Separate Thread Pool (#8170)
This commit is contained in:
BillyGalbreath
2022-08-08 09:23:12 -05:00
parent 7e7693cb64
commit 28e3713086
23 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e2980799025fcbe 100644
index e04c2f0cdba79526ca03faa03409a3cb4767aad4..4bf5efd39938db79bba660efc2969022e8057abd 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -138,7 +138,7 @@ public class Commands {
@@ -137,7 +137,7 @@ public class Commands {
CloneCommands.register(this.dispatcher, commandRegistryAccess);
DataCommands.register(this.dispatcher);
DataPackCommand.register(this.dispatcher);
@@ -17,7 +17,7 @@ index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e298079
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher);
@@ -299,9 +299,9 @@ public class Commands {
@@ -298,9 +298,9 @@ public class Commands {
public int performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
@@ -29,7 +29,7 @@ index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e298079
byte b0;
@@ -364,7 +364,7 @@ public class Commands {
@@ -363,7 +363,7 @@ public class Commands {
b0 = 0;
}
} finally {
@@ -39,7 +39,7 @@ index 5b4a89c696f6457bef24bb8792303dfde7ae510c..b5dea3cea431d8f92628ada67e298079
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c1397b9f2 100644
index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6b4884207 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -73,8 +73,8 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
+ }*/ // Purpur
MinecraftServer.LOGGER.info("Stopping server");
MinecraftTimings.stopServer(); // Paper
@@ -1199,18 +1199,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
@@ -1200,18 +1200,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Spigot end
@@ -98,7 +98,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
this.mayHaveDelayedTasks = true;
// Purpur start - tps catchup
if (org.purpurmc.purpur.PurpurConfig.tpsCatchup) {
@@ -1220,8 +1220,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1221,8 +1221,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Purpur end - tps catchup
this.waitUntilNextTick();
@@ -109,7 +109,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
this.isReady = true;
JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
}
@@ -1382,7 +1382,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1383,7 +1383,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -118,7 +118,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
super.doRunTask(ticktask);
}
@@ -1467,7 +1467,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1468,7 +1468,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
if (playerSaveInterval < 0) {
playerSaveInterval = autosavePeriod;
}
@@ -127,7 +127,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
try {
this.isSaving = true;
@@ -1482,7 +1482,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1483,7 +1483,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
} finally {
this.isSaving = false;
}
@@ -136,7 +136,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -1495,7 +1495,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1496,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
// Paper end
@@ -145,7 +145,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
long l = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
this.averageTickTime = this.averageTickTime * 0.8F + (float) l / 1000000.0F * 0.19999999F;
@@ -1508,7 +1508,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1509,7 +1509,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
this.frameTimer.logFrameDuration(i1 - i);
@@ -154,7 +154,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
org.spigotmc.WatchdogThread.tick(); // Spigot
//co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper // Purpur
}
@@ -1517,11 +1517,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1518,11 +1518,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
//MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper // Purpur
this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
//MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -168,7 +168,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
Iterator iterator = this.getAllLevels().iterator();
// CraftBukkit start
@@ -1562,18 +1562,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1563,18 +1563,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
@@ -192,7 +192,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
try {
//worldserver.timings.doTick.startTiming(); // Spigot // Purpur
@@ -1599,17 +1599,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1600,17 +1600,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
throw new ReportedException(crashreport);
}
@@ -214,7 +214,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
//MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
this.playerList.tick();
//MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -1617,7 +1617,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1618,7 +1618,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
GameTestTicker.SINGLETON.tick();
}
@@ -223,7 +223,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
//MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
for (int i = 0; i < this.tickables.size(); ++i) {
@@ -1625,7 +1625,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1626,7 +1626,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
//MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
@@ -232,7 +232,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
}
public boolean isNetherEnabled() {
@@ -2257,7 +2257,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2258,7 +2258,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -241,7 +241,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
return this.profiler;
}
@@ -2497,7 +2497,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2498,7 +2498,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
private void startMetricsRecordingTick() {
@@ -250,7 +250,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
this.executeBlocking(() -> {
this.saveDebugReport(path.resolve("server"));
@@ -2507,40 +2507,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2508,40 +2508,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.willStartRecordingMetrics = false;
}
@@ -303,7 +303,7 @@ index a9caa5529c91f8f1adaea8ae9ba0615bb2604f52..b6d5c5df02ff2dde7ac7846e9494248c
}
public Path getWorldPath(LevelResource worldSavePath) {
@@ -2585,15 +2585,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2586,15 +2586,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public boolean isTimeProfilerRunning() {
@@ -802,7 +802,7 @@ index ad14dbed67ca622f9c8e05164104fe9a9c5b59d4..c50dc34a731477c76315d8ef6b59b853
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index dd4c1c3cd907b943ab1740d0c9de8652807b27b7..fb0980743d765e16e2a1dcf37a00cdb0c68c3350 100644
index 4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d..08c46cdc626e89fed0d769d50735e983f2fb7f23 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1153,7 +1153,7 @@ public class ServerPlayer extends Player {
@@ -835,7 +835,7 @@ index dd4c1c3cd907b943ab1740d0c9de8652807b27b7..fb0980743d765e16e2a1dcf37a00cdb0
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index f0ce2e74a57ffbd9bf1aaf7535250c3862f351eb..702a3de778093c6a8c58c2602753a6a0ee1dfb31 100644
index 2c9a7a8e21aa8d03569840a3d157d0d2e0e00e72..eac0202c2622fc99712df23f1591c9cc3d8b0cbc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -419,7 +419,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic