OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-22 15:05:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix EntityDismountEvent being fired on gen threads

Browse source
This commit is contained in:
Shane Freeder 2020-06-29 14:48:24 +01:00
parent 849ede2317
commit d84b4a3b26
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Spigot-Server-Patches/Don-t-fire-unleash-dismount-events-from-worldgen-thr.patch
View file

@ -18,6 +18,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
VehicleExitEvent event = new VehicleExitEvent( VehicleExitEvent event = new VehicleExitEvent(
(Vehicle) getBukkitEntity(), (Vehicle) getBukkitEntity(),
(LivingEntity) entity.getBukkitEntity(), !suppressCancellation // Paper (LivingEntity) entity.getBukkitEntity(), !suppressCancellation // Paper
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
// CraftBukkit end
// Spigot start
org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity(), !suppressCancellation); // Paper
- Bukkit.getPluginManager().callEvent(event);
+ if (MCUtil.isMainThread()) Bukkit.getPluginManager().callEvent(event); // Paper
if (event.isCancelled()) {
return false;
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java --- a/src/main/java/net/minecraft/server/EntityInsentient.java