File tree Expand file tree Collapse file tree 2 files changed +10
-11
lines changed
src/main/java/at/hannibal2/skyhanni/features/damageindicator Expand file tree Collapse file tree 2 files changed +10
-11
lines changed Original file line number Diff line number Diff line change 33SkyHanni would not be possible without the following open source software:
44
55| Software | License |
6- | ------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- |
7- | [ Apache Commons Lang] ( https://github.com/apache/commons-lang ) | [ Apache 2.0] ( https://www. apache.org/licenses/ LICENSE-2.0. txt ) |
8- | [ GSON] ( https://github.com/google/gson ) | [ Apache 2.0] ( https://www.apache.org/licenses/ LICENSE-2.0.txt ) |
6+ | -------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
7+ | [ Apache Commons Lang] ( https://github.com/apache/commons-lang ) | [ Apache 2.0] ( https://github.com/ apache/commons-lang/blob/master/ LICENSE. txt ) |
8+ | [ GSON] ( https://github.com/google/gson ) | [ Apache 2.0] ( https://github.com/google/gson/blob/master/ LICENSE ) |
99| [ Minecraft Forge] ( https://github.com/MinecraftForge/MinecraftForge/tree/1.8.9 ) | [ Minecraft Forge License] ( https://github.com/MinecraftForge/MinecraftForge/blob/1.8.9/MinecraftForge-License.txt ) |
10- | [ Not Enough Updates] ( https://github.com/Moulberry /NotEnoughUpdates/ ) | [ Creative Commons Public License ] ( https://creativecommons.org/licenses/by-nc/3.0/ ) |
10+ | [ Not Enough Updates] ( https://github.com/NotEnoughUpdates /NotEnoughUpdates/ ) | [ LGPL 3.0 ] ( https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/COPYING ) |
1111| [ Wynntils] ( https://github.com/Wynntils/Wynntils ) | [ AGPL 3.0] ( https://github.com/Wynntils/Wynntils/blob/development/LICENSE ) |
1212| [ Skytils] ( https://github.com/Skytils/SkytilsMod ) | [ AGPL 3.0] ( https://github.com/Skytils/SkytilsMod/blob/1.x/LICENSE.md ) |
13- | [ Forge1.8.9Template] ( https://github.com/romangraef/Forge1.8.9Template ) | [ AGPL 3.0 ] ( https://github.com/Skytils/SkytilsMod /blob/1.x /LICENSE.md ) |
13+ | [ Forge1.8.9Template] ( https://github.com/romangraef/Forge1.8.9Template ) | [ Unlicensed ] ( https://github.com/romangraef/Forge1.8.9Template /blob/master /LICENSE ) |
Original file line number Diff line number Diff line change @@ -544,14 +544,13 @@ class DamageIndicatorManager {
544544 }
545545
546546 @SubscribeEvent(priority = EventPriority .HIGH )
547- fun onRenderLiving (e : RenderLivingEvent .Specials .Pre <EntityLivingBase >) {
548- val entity = e .entity
547+ fun onRenderLiving (event : RenderLivingEvent .Specials .Pre <EntityLivingBase >) {
548+ val entity = event .entity
549549 if (entity.ticksExisted > 300 || entity !is EntityArmorStand ) return
550550 if (! entity.hasCustomName()) return
551551 if (entity.isDead) return
552- val strippedName = entity.customNameTag.removeColor().replace(" ," , " " )
553- val damageMatcher = damagePattern.matcher(strippedName)
554- if (! damageMatcher.matches()) return
552+ val name = entity.customNameTag.removeColor().replace(" ," , " " )
553+ if (! damagePattern.matcher(name).matches()) return
555554
556555 if (SkyHanniMod .feature.misc.fixSkytilsDamageSplash) {
557556 entity.customNameTag = entity.customNameTag.replace(" ," , " " )
@@ -562,7 +561,7 @@ class DamageIndicatorManager {
562561 val distance = it.entity.getLorenzVec().distance(entity.getLorenzVec())
563562 distance < 4.5
564563 }) {
565- e .isCanceled = true
564+ event .isCanceled = true
566565 }
567566 }
568567 }
You can’t perform that action at this time.
0 commit comments