Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,3 @@ index e0d8490778399232151c023d4a71e549f2f4c932..cb5efea0c38c369b5403af7c1604c131
// Paper start - Server Tick Events
long endTime = System.nanoTime();
long remaining = this.nextTickTimeNanos - endTime;
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
index 989ac565c47a70c7947cb7315d0f5c2cfecd0363..c6aa7b4a9d05470a2f7659759fa4d3f2d89300fb 100644
--- a/net/minecraft/server/players/PlayerList.java
+++ b/net/minecraft/server/players/PlayerList.java
@@ -170,6 +170,7 @@ public abstract class PlayerList {
GameProtocols.SERVERBOUND_TEMPLATE.bind(RegistryFriendlyByteBuf.decorator(this.server.registryAccess()), serverGamePacketListenerImpl),
serverGamePacketListenerImpl
);
+ gg.pufferfish.pufferfish.flare.ProfilingManager.injectProfilingHandler(player); // Pufferfish - Flare
serverGamePacketListenerImpl.suspendFlushing();
GameRules gameRules = serverLevel.getGameRules();
boolean flag = gameRules.get(GameRules.IMMEDIATE_RESPAWN);
@@ -431,6 +432,7 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.@Nullable Component remove(ServerPlayer player, net.kyori.adventure.text.Component leaveMessage) {
// Paper end - Fix kick event leave message not being sent
+ gg.pufferfish.pufferfish.flare.ProfilingManager.uninjectProfilingHandler(player); // Pufferfish - Flare
ServerLevel serverLevel = player.level();
player.awardStat(Stats.LEAVE_GAME);
// CraftBukkit start - Quitting must be before we do final save of data, in case plugins need to modify it
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import gg.pufferfish.pufferfish.PufferfishLogger;
import gg.pufferfish.pufferfish.compat.ServerConfigurations;
import gg.pufferfish.pufferfish.flare.collectors.GCEventCollector;
import gg.pufferfish.pufferfish.flare.collectors.PacketCollector;
import gg.pufferfish.pufferfish.flare.collectors.StatCollector;
import gg.pufferfish.pufferfish.flare.collectors.TPSCollector;
import gg.pufferfish.pufferfish.flare.collectors.ThreadCollector;
Expand All @@ -20,7 +19,6 @@
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import org.bukkit.Bukkit;
import oshi.SystemInfo;
import oshi.hardware.CentralProcessor;
Expand Down Expand Up @@ -118,7 +116,7 @@ public static synchronized boolean start(ProfileType profileType) throws UserRep
.withVersion("Minecraft Version", Bukkit.getMinecraftVersion())

.withGraphCategories(CustomCategories.ENTITIES_AND_CHUNKS, CustomCategories.MC_PERF)
.withCollectors(new TPSCollector(), new WorldCountCollector(ProfilingManager::submitToMainThread), new GCEventCollector(), new StatCollector(), new ThreadCollector(), PacketCollector.INSTANCE)
.withCollectors(new TPSCollector(), new WorldCountCollector(ProfilingManager::submitToMainThread), new GCEventCollector(), new StatCollector(), new ThreadCollector())
.withClassIdentifier(PluginLookup::getPluginForClass)

.withHardware(new FlareBuilder.HardwareBuilder()
Expand Down Expand Up @@ -214,16 +212,6 @@ public static void executeMainThreadTasks() {
}
}

public static void injectProfilingHandler(ServerPlayer player) {
if (ProfilingManager.isProfiling()) {
PacketCollector.INSTANCE.injectProfilingHandler(player);
}
}

public static void uninjectProfilingHandler(ServerPlayer player) {
PacketCollector.INSTANCE.uninjectProfilingHandler(player);
}

private static void broadcastPrefixed(Component ...lines) {
Stream.concat(
MinecraftServer.getServer().server.getOnlinePlayers().stream(),
Expand Down

This file was deleted.