From 7e331c24edff3c18e2e5cb93f10a8a1dc49a6ed4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 18 Dec 2020 11:48:47 -0600 Subject: [PATCH] Fix #118 Phantom fire time not working --- patches/server/0111-Ridables.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/patches/server/0111-Ridables.patch b/patches/server/0111-Ridables.patch index bbe84ec01..2c22467de 100644 --- a/patches/server/0111-Ridables.patch +++ b/patches/server/0111-Ridables.patch @@ -6219,10 +6219,10 @@ index 0000000000000000000000000000000000000000..a01524c6abaec13d7249d7aba6da9e4b +} diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java new file mode 100644 -index 0000000000000000000000000000000000000000..929e4ff91c79e2ee72970d754bae270377ac9314 +index 0000000000000000000000000000000000000000..3059078c37deb35fcd20e27767f9b79503802cf4 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java -@@ -0,0 +1,125 @@ +@@ -0,0 +1,128 @@ +package net.pl3x.purpur.entity; + +import net.minecraft.server.BlockBase; @@ -6339,6 +6339,9 @@ index 0000000000000000000000000000000000000000..929e4ff91c79e2ee72970d754bae2703 + Entity shooter = getShooter(); + if (shooter instanceof EntityLiving) { + rayTrace.getEntity().damageEntity(DamageSource.indirectMobAttack(this, (EntityLiving) shooter).setProjectile(), world.purpurConfig.phantomFlameDamage); ++ if (world.purpurConfig.phantomFlameFireTime > 0) { ++ rayTrace.getEntity().setOnFire(world.purpurConfig.phantomFlameFireTime); ++ } + } + } +