Merge branch 'master' into dev

lord-server · Jan 13, 2025 · 72483e5 · 72483e5
2 parents e3cdac0 + f3f36de
commit 72483e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [2024.12.p6](https://github.com/lord-server/lord/releases/tag/2024.12.p6)
+ - Balrog-arena: revert prod arena coords. Fixes #1950
+
 ## [2024.12.p5](https://github.com/lord-server/lord/releases/tag/2024.12.p5)
  - Balrog arena: fix limitted spawn. Fixes #1891
  - Fix crash on read book. Fixes #1895 (#1898)

diff --git a/mods/lord/World/arena/init.lua b/mods/lord/World/arena/init.lua
@@ -141,7 +141,7 @@ minetest.register_node("arena:lighting_gas", {
 ------------
 -- ARENAS --
 ------------
-arena.add_arena({x=4, y=-38, z=28}, {x=64, y=-21, z=84}, {
+arena.add_arena({x=1143, y=-30911, z=-50}, {x=1189, y=-30900, z=-4}, {
 	["lottmobs:balrog"] = 10,
 })