From 701240bc3a17a73d73f3a96cd81e559d662ac42c Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.li>
Date: Sun, 09 Dec 2018 16:01:10 +0100
Subject: [PATCH] Quarry: Check for valid facedir to fix server freeze #465 (#466)
---
technic/machines/power_monitor.lua | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/technic/machines/power_monitor.lua b/technic/machines/power_monitor.lua
index 4306693..7e8b850 100644
--- a/technic/machines/power_monitor.lua
+++ b/technic/machines/power_monitor.lua
@@ -4,6 +4,8 @@
local S = technic.getter
+local cable_entry = "^technic_cable_connection_overlay.png"
+
minetest.register_craft({
output = "technic:power_monitor",
recipe = {
@@ -17,10 +19,10 @@
description = S("Power Monitor"),
tiles = {
"technic_power_monitor_sides.png",
- "technic_power_monitor_bottom_back.png",
+ "technic_power_monitor_sides.png"..cable_entry,
"technic_power_monitor_sides.png",
"technic_power_monitor_sides.png",
- "technic_power_monitor_bottom_back.png",
+ "technic_power_monitor_sides.png"..cable_entry,
"technic_power_monitor_front.png"
},
paramtype2 = "facedir",
@@ -35,7 +37,7 @@
minetest.register_abm({
nodenames = {"technic:power_monitor"},
- label = "Power Monitor",
+ label = "Machines: run power monitor",
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
@@ -53,7 +55,7 @@
local demand = sw_meta:get_int("demand")
meta:set_string("infotext",
S("Power Monitor. Supply: @1 Demand: @2",
- technic.pretty_num(supply), technic.pretty_num(demand)))
+ technic.EU_string(supply), technic.EU_string(demand)))
else
meta:set_string("infotext",S("Power Monitor Has No Network"))
end
--
Gitblit v1.8.0