Skip to content

feat: add option to skip entity events when creating #3253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dordsor21 merged 4 commits into from
Dec 30, 2025
Merged

feat: add option to skip entity events when creating #3253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab5525a
feat: add option to skip entity events when creating
dordsor21 Jul 27, 2025
c6141cf
Adjustments
dordsor21 Aug 9, 2025
363f234
Add for 1.21.9/10, set events=false for later paper versions
dordsor21 Oct 25, 2025
89e6aaf
add for 1.21.11
dordsor21 Dec 30, 2025
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
3 changes: 2 additions & 1 deletion ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
//FAWE end
);

Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ public BaseBlock getFullBlock(final Location location) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
);

@Override
Expand Down
35 changes: 27 additions & 8 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,15 +670,34 @@ protected <T extends Future<T>> T internalCall(
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
Runnable onError = () -> LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
entity.generation = false;
if (PaperLib.isPaper()) {
if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
onError.run();
}
continue;
}
// Not paper
try {
PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
continue;
} catch (IllegalAccessException e) {
// Fallback
LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
}
}
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
onError.run();
// Unsuccessful create should not be saved to history
iterator.remove();
}
Expand Down
11 changes: 9 additions & 2 deletions ...ava/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightPlatformAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,15 +694,22 @@ static List<Entity> getEntities(LevelChunk chunk) {
}
}
try {
//noinspection unchecked
return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());
} catch (IllegalAccessException e) {
collector.add(new RuntimeException("Failed to lookup entities [PAPER=false]", e));
}
collector.throwIfPresent();
return List.of();
}

/**
* Spigot only
*/
static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {
//noinspection unchecked
return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));
}

record FakeIdMapBlock(int size) implements IdMap<net.minecraft.world.level.block.state.BlockState> {

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
//FAWE end
);

Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ public BaseBlock getFullBlock(final Location location) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
);

@Override
Expand Down
35 changes: 27 additions & 8 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,15 +671,34 @@ protected <T extends Future<T>> T internalCall(
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
Runnable onError = () -> LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
entity.generation = false;
if (PaperLib.isPaper()) {
if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
onError.run();
}
continue;
}
// Not paper
try {
PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
continue;
} catch (IllegalAccessException e) {
// Fallback
LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
}
}
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
onError.run();
// Unsuccessful create should not be saved to history
iterator.remove();
}
Expand Down
11 changes: 9 additions & 2 deletions ...ava/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightPlatformAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,15 +694,22 @@ static List<Entity> getEntities(LevelChunk chunk) {
}
}
try {
//noinspection unchecked
return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());
} catch (IllegalAccessException e) {
collector.add(new RuntimeException("Failed to lookup entities [PAPER=false]", e));
}
collector.throwIfPresent();
return List.of();
}

/**
* Spigot only
*/
static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {
//noinspection unchecked
return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));
}

record FakeIdMapBlock(int size) implements IdMap<net.minecraft.world.level.block.state.BlockState> {

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
//FAWE end
);

Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ public BaseBlock getFullBlock(final Location location) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
);

@Override
Expand Down
35 changes: 27 additions & 8 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,15 +672,34 @@ protected <T extends Future<T>> T internalCall(
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
Runnable onError = () -> LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
entity.generation = false;
if (PaperLib.isPaper()) {
if (!nmsWorld.getEntityLookup().addNewEntity(entity)) {
onError.run();
}
continue;
}
// Not paper
try {
PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
continue;
} catch (IllegalAccessException e) {
// Fallback
LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
}
}
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
onError.run();
// Unsuccessful create should not be saved to history
iterator.remove();
}
Expand Down
11 changes: 9 additions & 2 deletions ...ava/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,15 +688,22 @@ static List<Entity> getEntities(LevelChunk chunk) {
}
}
try {
//noinspection unchecked
return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());
} catch (IllegalAccessException e) {
collector.add(new RuntimeException("Failed to lookup entities [PAPER=false]", e));
}
collector.throwIfPresent();
return List.of();
}

/**
* Spigot only
*/
static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {
//noinspection unchecked
return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));
}

record FakeIdMapBlock(int size) implements IdMap<net.minecraft.world.level.block.state.BlockState> {

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,8 @@ private ResourceKey<LevelStem> getWorldDimKey(Environment env) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
//FAWE end
);

Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,8 @@ public BaseBlock getFullBlock(final Location location) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
);

@Override
Expand Down
35 changes: 27 additions & 8 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,15 +680,34 @@ protected <T extends Future<T>> T internalCall(
entity.load(tag);
entity.absMoveTo(x, y, z, yaw, pitch);
entity.setUUID(NbtUtils.uuid(nativeTag));
Runnable onError = () -> LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
if (!set.getSideEffectSet().shouldApply(SideEffect.ENTITY_EVENTS)) {
entity.spawnReason = CreatureSpawnEvent.SpawnReason.CUSTOM;
entity.generation = false;
if (PaperLib.isPaper()) {
if (!nmsWorld.moonrise$getEntityLookup().addNewEntity(entity)) {
onError.run();
}
continue;
}
// Not paper
try {
PaperweightPlatformAdapter.getEntitySectionManager(nmsWorld).addNewEntity(entity);
continue;
} catch (IllegalAccessException e) {
// Fallback
LOGGER.warn("Error bypassing entity events on spawn on Spigot", e);
}
}
if (!nmsWorld.addFreshEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM)) {
LOGGER.warn(
"Error creating entity of type `{}` in world `{}` at location `{},{},{}`",
id,
nmsWorld.getWorld().getName(),
x,
y,
z
);
onError.run();
// Unsuccessful create should not be saved to history
iterator.remove();
}
Expand Down
11 changes: 9 additions & 2 deletions ...ava/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightPlatformAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,13 +668,20 @@ static List<Entity> getEntities(LevelChunk chunk) {
}).orElse(Collections.emptyList());
}
try {
//noinspection unchecked
return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
return getEntitySectionManager(chunk.level).getEntities(chunk.getPos());
} catch (IllegalAccessException e) {
throw new RuntimeException("Failed to lookup entities [PAPER=false]", e);
}
}

/**
* Spigot only
*/
static PersistentEntitySectionManager<Entity> getEntitySectionManager(ServerLevel level) throws IllegalAccessException {
//noinspection unchecked
return (PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(level));
}

record FakeIdMapBlock(int size) implements IdMap<net.minecraft.world.level.block.state.BlockState> {

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ public BaseBlock getFullBlock(final Location location) {
SideEffect.HISTORY,
SideEffect.HEIGHTMAPS,
SideEffect.LIGHTING,
SideEffect.NEIGHBORS
SideEffect.NEIGHBORS,
SideEffect.ENTITY_EVENTS
);

@Override
Expand Down
Loading
Loading