From 0447e43be9533197cb61bf6a24c384d78066de24 Mon Sep 17 00:00:00 2001 From: orwell96 Date: Sun, 2 Apr 2017 17:07:58 +0200 Subject: [PATCH] Actually check for protection when placing trains and use the train_place privilege --- advtrains.zip | Bin 4986367 -> 4986418 bytes advtrains/advtrains/wagons.lua | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/advtrains.zip b/advtrains.zip index 0a9a0ec1519eff1ce738c55481761cdca047fda9..e032ace9013097ccea9d0fb1e4034b6cde9d100c 100644 GIT binary patch delta 6722 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 diff --git a/advtrains/advtrains/wagons.lua b/advtrains/advtrains/wagons.lua index 641b8b4..1074dc1 100644 --- a/advtrains/advtrains/wagons.lua +++ b/advtrains/advtrains/wagons.lua @@ -847,6 +847,10 @@ function advtrains.register_wagon(sysname, prototype, desc, inv_img) atprint("no track here, not placing.") return itemstack end + if not minetest.check_player_privs(placer, {train_place = true }) and minetest.is_protected(pointed_thing.under, placer:get_player_name()) then + minetest.record_protection_violation(pointed_thing.under, placer:get_player_name()) + return + end local conn1=advtrains.get_track_connections(node.name, node.param2) local id=advtrains.create_new_train_at(pointed_thing.under, advtrains.dirCoordSet(pointed_thing.under, conn1))