fixed OPEN_SOURCE_SOFTWARE.md

hannibal002 · Aug 19, 2022 · 0be6c7f · 0be6c7f
1 parent bd6a39b
commit 0be6c7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/OPEN_SOURCE_SOFTWARE.md b/OPEN_SOURCE_SOFTWARE.md
@@ -3,11 +3,11 @@
 SkyHanni would not be possible without the following open source software:
 
 | Software                                                                       | License                                                                                                           |
-| ------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- |
-| [Apache Commons Lang](https://github.com/apache/commons-lang)                  | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)                                                     |
-| [GSON](https://github.com/google/gson)                                         | [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)                                                     |
+|--------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
+| [Apache Commons Lang](https://github.com/apache/commons-lang)                  | [Apache 2.0](https://github.com/apache/commons-lang/blob/master/LICENSE.txt)                                      |
+| [GSON](https://github.com/google/gson)                                         | [Apache 2.0](https://github.com/google/gson/blob/master/LICENSE)                                                  |
 | [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) |
-| [Not Enough Updates](https://github.com/Moulberry/NotEnoughUpdates/)           | [Creative Commons Public License](https://creativecommons.org/licenses/by-nc/3.0/)                                |
+| [Not Enough Updates](https://github.com/NotEnoughUpdates/NotEnoughUpdates/)    | [LGPL 3.0](https://github.com/NotEnoughUpdates/NotEnoughUpdates/blob/master/COPYING)                              |
 | [Wynntils](https://github.com/Wynntils/Wynntils)                               | [AGPL 3.0](https://github.com/Wynntils/Wynntils/blob/development/LICENSE)                                         |
 | [Skytils](https://github.com/Skytils/SkytilsMod)                               | [AGPL 3.0](https://github.com/Skytils/SkytilsMod/blob/1.x/LICENSE.md)                                             |
-| [Forge1.8.9Template](https://github.com/romangraef/Forge1.8.9Template)                               | [AGPL 3.0](https://github.com/Skytils/SkytilsMod/blob/1.x/LICENSE.md)                                             |
+| [Forge1.8.9Template](https://github.com/romangraef/Forge1.8.9Template)         | [Unlicensed](https://github.com/romangraef/Forge1.8.9Template/blob/master/LICENSE)                                |
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -544,14 +544,13 @@ class DamageIndicatorManager {
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
-    fun onRenderLiving(e: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
-        val entity = e.entity
+    fun onRenderLiving(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) {
+        val entity = event.entity
         if (entity.ticksExisted > 300 || entity !is EntityArmorStand) return
         if (!entity.hasCustomName()) return
         if (entity.isDead) return
-        val strippedName = entity.customNameTag.removeColor().replace(",", "")
-        val damageMatcher = damagePattern.matcher(strippedName)
-        if (!damageMatcher.matches()) return
+        val name = entity.customNameTag.removeColor().replace(",", "")
+        if (!damagePattern.matcher(name).matches()) return
 
         if (SkyHanniMod.feature.misc.fixSkytilsDamageSplash) {
             entity.customNameTag = entity.customNameTag.replace(",", "")
@@ -562,7 +561,7 @@ class DamageIndicatorManager {
                     val distance = it.entity.getLorenzVec().distance(entity.getLorenzVec())
                     distance < 4.5
                 }) {
-                e.isCanceled = true
+                event.isCanceled = true
             }
         }
     }