Merge remote-tracking branch 'origin/master'

Author: 0ffz

src/main/java/com/derongan/minecraft/deeperworld/config/DeeperConfig.kt

@@ -20,7 +20,9 @@ object DeeperConfig : IdofrontConfig<DeeperConfig.Data>(deeperWorld, Data.serial
         val remountPacketDelay: TimeSpan = 40.ticks,
         val fall: FallDamageConfig = FallDamageConfig(),
         val time: TimeConfig = TimeConfig(),
-    )
+    ) {
+        val worlds = sections.map { it.world }.toSet()
+    }
 
     init {
         load()

src/main/java/com/derongan/minecraft/deeperworld/listeners/MovementListener.kt

@@ -55,9 +55,10 @@ object MovementListener : Listener {
     private fun onPlayerMoveInternal(player: Player, from: Location, to: Location) {
         val current = WorldManager.getSectionFor(player.location) ?: let {
             //damage players outside of sections
-            if (!DeeperConfig.data.damageExcludedWorlds.contains(player.location.world)
-                && DeeperConfig.data.damageOutsideSections > 0.0
+            if (DeeperConfig.data.damageOutsideSections > 0.0
+                && player.location.world !in DeeperConfig.data.damageExcludedWorlds
                 && (player.gameMode == GameMode.SURVIVAL || player.gameMode == GameMode.ADVENTURE)
+                && player.location.world in (DeeperConfig.data.worlds)
             ) {
                 player.damage(0.01) //give a damage effect
                 player.health = (player.health - DeeperConfig.data.damageOutsideSections / 10)