Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
6fda3fd0ed
This makes it so entities that are passengers of other entities no longer count in the parents timings, as well as tracks them as a separate timers per their tick status. This lets you see how much time is spent in activated entities vs inactive (as inactive still has to do work) Passengers is also tracked separately so you can identify "Villagers in Minecarts" vs roaming villagers, as the lack of ability to move can impact their performance characteristics. This will likely break any plugin that was naughty and directly messed with our internal timings as this moves the timings to the EntityTypes object, speeding up creation of Entities to no longer store a timing handler object per entity. This will also change the output of the entities in timings to use internal ID's instead of class names. If a plugin is broken by this, shame them for doing bad things. Paper will not fix it, they will have to fix it.
22 Zeilen
1.3 KiB
Diff
22 Zeilen
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 21 Jun 2016 22:54:34 -0400
|
|
Subject: [PATCH] Fix Double World Add issues
|
|
|
|
Vanilla will double add Spider Jockeys to the world, so ignore already added.
|
|
|
|
Also add debug if something else tries to, and abort before world gets bad state
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index be5e3eb71f9aa1db63e7fa3e5fb750cc066662d8..aab9d9000285feeb5d5b6dbe1d296779ec5b67f2 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -922,6 +922,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
// CraftBukkit start
|
|
private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
|
|
org.spigotmc.AsyncCatcher.catchOp("entity add"); // Spigot
|
|
+ if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
|
|
if (entity.dead) {
|
|
// WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
|
|
return false;
|