Skip to content

Commit ee3b405

Browse files
committed
Replace spigot check with generation check
1 parent b8fe22c commit ee3b405

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,11 +1065,10 @@
10651065
@Override
10661066
public CrashReportCategory fillReportDetails(CrashReport report) {
10671067
CrashReportCategory crashReportCategory = super.fillReportDetails(report);
1068-
@@ -1712,6 +_,8 @@
1068+
@@ -1712,6 +_,7 @@
10691069
final class EntityCallbacks implements LevelCallback<Entity> {
10701070
@Override
10711071
public void onCreated(Entity entity) {
1072-
+ entity.inWorld = true; // CraftBukkit - Mark entity as in world
10731072
+ entity.setOldPosAndRot(); // Paper - update old pos / rot for new entities as it will default to Vec3.ZERO
10741073
}
10751074

@@ -1109,10 +1108,11 @@
11091108
String string = "onTrackingStart called during navigation iteration";
11101109
Util.logAndPauseIfInIde(
11111110
"onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration")
1112-
@@ -1755,10 +_,51 @@
1111+
@@ -1755,10 +_,52 @@
11131112
}
11141113

11151114
entity.updateDynamicGameEventListener(DynamicGameEventListener::add);
1115+
+ entity.inWorld = true; // CraftBukkit - Mark entity as in world
11161116
+ entity.valid = true; // CraftBukkit
11171117
+ ServerLevel.this.getChunkSource().addEntity(entity); // Paper - ignore and warn about illegal addEntity calls instead of crashing server
11181118
+ // Paper start - Entity origin API

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1961,10 +1961,8 @@ public static void callEntityRemoveEvent(Entity entity, EntityRemoveEvent.Cause
19611961
return;
19621962
}
19631963

1964-
// SPIGOT-8041: Do not call event unless entity has been spawned into world
1965-
if (!entity.inWorld) {
1966-
return;
1967-
}
1964+
// Do not call during generation.
1965+
if (entity.generation) return;
19681966

19691967
Bukkit.getPluginManager().callEvent(new EntityRemoveEvent(entity.getBukkitEntity(), cause));
19701968
}

0 commit comments

Comments
 (0)