Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix a bunch of duplicate EntityCombustEvent calls

Browse Source
This commit is contained in:
md_5 2019-01-11 11:41:32 +11:00
parent 438556243d
commit 843cee65f3
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nms-patches/Entity.patch
View File

@ -287,7 +287,7 @@
+ world.getServer().getPluginManager().callEvent(event); + world.getServer().getPluginManager().callEvent(event);
+ +
+ if (!event.isCancelled()) { + if (!event.isCancelled()) {
+ this.setOnFire(event.getDuration()); + this.setOnFire(event.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }
@ -593,7 +593,7 @@
+ EntityCombustByEntityEvent entityCombustEvent = new EntityCombustByEntityEvent(stormBukkitEntity, thisBukkitEntity, 8); + EntityCombustByEntityEvent entityCombustEvent = new EntityCombustByEntityEvent(stormBukkitEntity, thisBukkitEntity, 8);
+ pluginManager.callEvent(entityCombustEvent); + pluginManager.callEvent(entityCombustEvent);
+ if (!entityCombustEvent.isCancelled()) { + if (!entityCombustEvent.isCancelled()) {
+ this.setOnFire(entityCombustEvent.getDuration()); + this.setOnFire(entityCombustEvent.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }

2
nms-patches/EntityArrow.patch
View File

@ -39,7 +39,7 @@
+ EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5); + EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
+ org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent); + org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
+ if (!combustEvent.isCancelled()) { + if (!combustEvent.isCancelled()) {
+ entity.setOnFire(combustEvent.getDuration()); + entity.setOnFire(combustEvent.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }

2
nms-patches/EntityHuman.patch
View File

@ -234,7 +234,7 @@
+ +
+ if (!combustEvent.isCancelled()) { + if (!combustEvent.isCancelled()) {
+ flag4 = true; + flag4 = true;
+ entity.setOnFire(combustEvent.getDuration()); + entity.setOnFire(combustEvent.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }

2
nms-patches/EntityInsentient.patch
View File

@ -215,7 +215,7 @@
+ org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent); + org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
+ +
+ if (!combustEvent.isCancelled()) { + if (!combustEvent.isCancelled()) {
+ entity.setOnFire(combustEvent.getDuration()); + entity.setOnFire(combustEvent.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }

2
nms-patches/EntitySmallFireball.patch
View File

@ -31,7 +31,7 @@
+ movingobjectposition.entity.world.getServer().getPluginManager().callEvent(event); + movingobjectposition.entity.world.getServer().getPluginManager().callEvent(event);
+ +
+ if (!event.isCancelled()) { + if (!event.isCancelled()) {
+ movingobjectposition.entity.setOnFire(event.getDuration()); + movingobjectposition.entity.setOnFire(event.getDuration(), false);
+ } + }
+ } + }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/EntityZombie.patch
View File

@ -73,7 +73,7 @@
+ this.world.getServer().getPluginManager().callEvent(event); + this.world.getServer().getPluginManager().callEvent(event);
+ +
+ if (!event.isCancelled()) { + if (!event.isCancelled()) {
+ entity.setOnFire(event.getDuration()); + entity.setOnFire(event.getDuration(), false);
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }