Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-10 17:42:16 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-6616: Cancellable StriderTemperatureChangeEvent

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2021-07-03 09:36:51 +10:00
parent fec9294c47
commit bc5ed0e911
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
paper-server/nms-patches/net/minecraft/world/entity/monster/EntityStrider.patch
View File

@ -1,14 +1,15 @@
--- a/net/minecraft/world/entity/monster/EntityStrider.java --- a/net/minecraft/world/entity/monster/EntityStrider.java
+++ b/net/minecraft/world/entity/monster/EntityStrider.java +++ b/net/minecraft/world/entity/monster/EntityStrider.java
@@ -321,7 +321,12 @@ @@ -321,7 +321,13 @@
IBlockData iblockdata1 = this.aU(); IBlockData iblockdata1 = this.aU();
boolean flag = iblockdata.a((Tag) TagsBlock.STRIDER_WARM_BLOCKS) || iblockdata1.a((Tag) TagsBlock.STRIDER_WARM_BLOCKS) || this.b((Tag) TagsFluid.LAVA) > 0.0D; boolean flag = iblockdata.a((Tag) TagsBlock.STRIDER_WARM_BLOCKS) || iblockdata1.a((Tag) TagsBlock.STRIDER_WARM_BLOCKS) || this.b((Tag) TagsFluid.LAVA) > 0.0D;
- this.setShivering(!flag); - this.setShivering(!flag);
+ // CraftBukkit start + // CraftBukkit start
+ if (!flag ^ this.isShivering()) { + if (!flag ^ this.isShivering()) {
+ org.bukkit.craftbukkit.event.CraftEventFactory.callStriderTemperatureChangeEvent(this, !flag); + if (org.bukkit.craftbukkit.event.CraftEventFactory.callStriderTemperatureChangeEvent(this, !flag)) {
+ this.setShivering(!flag); + this.setShivering(!flag);
+ }
+ } + }
+ // CraftBukkit end + // CraftBukkit end
super.tick(); super.tick();

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

@ -1585,9 +1585,10 @@ public class CraftEventFactory {
return event; return event;
} }
public static void callStriderTemperatureChangeEvent(EntityStrider strider, boolean shivering) { public static boolean callStriderTemperatureChangeEvent(EntityStrider strider, boolean shivering) {
StriderTemperatureChangeEvent event = new StriderTemperatureChangeEvent((Strider) strider.getBukkitEntity(), shivering); StriderTemperatureChangeEvent event = new StriderTemperatureChangeEvent((Strider) strider.getBukkitEntity(), shivering);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
return !event.isCancelled();
} }
public static boolean handleEntitySpellCastEvent(EntityIllagerWizard caster, EntityIllagerWizard.Spell spell) { public static boolean handleEntitySpellCastEvent(EntityIllagerWizard caster, EntityIllagerWizard.Spell spell) {