OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-30 16:19:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Unset Ignited flag on cancel of Explosion Event

Browse source 
Otherwise the creeper infinite explodes
This commit is contained in:
Aikar 2018-06-10 01:18:49 -04:00
parent d6d2d75fe6
commit 809fa1fbea
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
paper-server/patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch
View file

@ -54,7 +54,7 @@
itemstack.shrink(1); itemstack.shrink(1);
} else { } else {
itemstack.hurtAndBreak(1, player, getSlotForHand(hand)); itemstack.hurtAndBreak(1, player, getSlotForHand(hand));
@@ -246,11 +266,20 @@ @@ -246,11 +266,21 @@
if (world instanceof ServerLevel worldserver) { if (world instanceof ServerLevel worldserver) {
float f = this.isPowered() ? 2.0F : 1.0F; float f = this.isPowered() ? 2.0F : 1.0F;
@ -72,12 +72,13 @@
+ // CraftBukkit start + // CraftBukkit start
+ } else { + } else {
+ this.swell = 0; + this.swell = 0;
+ this.entityData.set(DATA_IS_IGNITED, Boolean.valueOf(false)); // Paper
+ } + }
+ // CraftBukkit end + // CraftBukkit end
} }
} }
@@ -258,9 +287,10 @@ @@ -258,9 +288,10 @@
private void spawnLingeringCloud() { private void spawnLingeringCloud() {
Collection<MobEffectInstance> collection = this.getActiveEffects(); Collection<MobEffectInstance> collection = this.getActiveEffects();
@ -89,7 +90,7 @@
entityareaeffectcloud.setRadius(2.5F); entityareaeffectcloud.setRadius(2.5F);
entityareaeffectcloud.setRadiusOnUse(-0.5F); entityareaeffectcloud.setRadiusOnUse(-0.5F);
entityareaeffectcloud.setWaitTime(10); entityareaeffectcloud.setWaitTime(10);
@@ -274,7 +304,7 @@ @@ -274,7 +305,7 @@
entityareaeffectcloud.addEffect(new MobEffectInstance(mobeffect)); entityareaeffectcloud.addEffect(new MobEffectInstance(mobeffect));
} }