Update cmer mod to Git commit 8f93082...

https://github.com/AntumMT/mod-cmer/tree/8f93082

README.md

@@ -56,7 +56,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
   * [sfinv_buttons][] ([MIT][lic.mit]) -- version [1.1.0 (ebb1f7c Git)][ver.sfinv_buttons] *2021-01-14*
 * libs/
   * [biome_lib][] ([LGPL][lic.lgpl3.0] / [CC BY-SA][lic.ccbysa4.0]) -- version: [2021-04-16-2][ver.biome_lib]
-  * [cmer][creatures] ([zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [revived 093d654 Git][ver.cmer] *2021-05-24*
+  * [cmer][creatures] ([zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [revived 8f93082 Git][ver.cmer] *2021-05-24*
   * [mobkit][] ([MIT][lic.mobkit]) -- version: [ddea141 Git][ver.mobkit] *2021-02-01*
   * [mobs_redo][] ([MIT][lic.mobs_redo] / [CC BY][lic.ccby3.0] / [CC0][lic.cc0]) -- version: [f6e16a5 Git][ver.mobs_redo] *2021-04-11*
   * [signs_lib][] ([LGPL][lic.lgpl3.0] / [CC BY-SA][lic.ccbysa4.0]) -- version: [2021-03-04-2][ver.signs_lib]
@@ -524,7 +524,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.chatlog]: https://github.com/AntumMT/mod-chatlog/tree/v1.0
 [ver.christmas]: https://github.com/TheZenKitteh/minetest-christmas/tree/d3bd872
 [ver.cleaner]: https://github.com/AntumMT/mod-cleaner/tree/e8359d8
-[ver.cmer]: https://github.com/AntumMT/mod-cmer/tree/093d654
+[ver.cmer]: https://github.com/AntumMT/mod-cmer/tree/8f93082
 [ver.cmer_chicken]: http://github.com/AntumMT/mod-cmer/tree/d2ddf22
 [ver.cmer_ghost]: https://github.com/AntumMT/mod-cmer/tree/1ace22c
 [ver.cmer_oerkki]: https://github.com/AntumMT/mod-cmer/tree/6e043e9

mods/libs/cmer/CHANGES.txt

@@ -11,6 +11,7 @@ revived-1.1
 - 'has_kockback' deprecated, use 'has_knockback'
 - does not automatically prepend colon (:) when registering a mob name
 - option to set nametag
+- griefing is disabled unless 'mobs_griefing' setting enabled
 
 
 revived-1.0

mods/libs/cmer/TODO.txt

@@ -9,11 +9,9 @@ TODO:
 	- mobs_spawn_protected
 	- remove_far_mobs
 	- mobs_drop_items
-	- mobs_griefing
 	- mob_chance_multiplier
 	- enable_peaceful_player
 - add health bars
 - respect "max_objects_per_block" setting
 - inflict variable amount of damage based on damage level of weapon
 - add range attacks
-- show name in nametag

mods/libs/cmer/functions.lua

@@ -276,6 +276,20 @@ cmer.on_punch = function(self, puncher, tflp, tc, dir)
 		return
 	end
 
+	if self.owner and puncher:is_player() and not cmer.griefing then
+		local pname = puncher:get_player_name()
+		if pname ~= self.owner then
+			if self.nametag then
+				core.chat_send_player(pname, "You cannot kill this " .. self.nametag:lower()
+					.. " owned by " .. self.owner .. ".")
+			else
+				core.chat_send_player(pname, "You cannot kill entities owned by " .. self.owner .. ".")
+			end
+
+			return
+		end
+	end
+
 	local me = self.object
 	local mypos = me:get_pos()
 
@@ -720,10 +734,10 @@ end
 cmer.get_staticdata = function(self)
 	return {
 		nametag = self.nametag,
+		owner = self.owner,
 		hp = self.object:get_hp(),
 		mode = self.mode,
 		tamed = self.tamed,
-		owner = self.owner,
 		modetimer = self.modetimer,
 		lifetimer = self.lifetimer,
 		soundtimer = self.soundtimer,

mods/libs/cmer/register.lua

@@ -39,7 +39,6 @@ local function translate_def(def)
 		visual = "mesh",
 		stepheight = 0.6, -- ensure we get over slabs/stairs
 		automatic_face_movement_dir = def.model.rotation or 0.0,
-		ownable = def.ownable,
 
 		mesh = def.model.mesh,
 		textures = def.model.textures,
@@ -49,14 +48,15 @@ local function translate_def(def)
 		collide_with_objects = def.model.collide_with_objects or true,
 		makes_footstep_sound = true,
 
+		nametag = cmer.nametags and def.nametag or nil,
+		ownable = def.ownable,
+
 		stats = def.stats,
 		model = def.model,
 		sounds = def.sounds,
 		combat = def.combat,
 		modes = {},
 		drops = def.drops,
-
-		nametag = cmer.enable_nametags and def.nametag or nil,
 	}
 
 	-- Tanslate modes to better accessable format
@@ -862,7 +862,7 @@ end
 --  @tparam string old_mob Name of mob to be replaced. E.g. "creatures:oerrki"
 --  @tparam string new_mob Name of mob that will replace instances old one. E.g. "creatures:oerkki"
 --  @treturn bool `true` if successful.
-function cmer.register_alias(old_mob, new_mob) -- returns true if sucessfull
+function cmer.register_alias(old_mob, new_mob)
 	local def = core.registered_entities[new_mob]
 	if not def then
 		throw_error("No valid definition for given.")

mods/libs/cmer/settings.lua

@@ -40,7 +40,14 @@ cmer.creative = core.settings:get_bool("creative_mode", false)
 
 --- Displays nametags above mobs.
 --
---  @setting enable_mob_nametags
+--  @setting mobs_nametags
 --  @settype bool
 --  @default false
-cmer.enable_nametags = core.settings:get_bool("enable_mob_nametags", false)
+cmer.nametags = core.settings:get_bool("mobs_nametags", false)
+
+--- Determines if owned entities can be killed by non-owners.
+--
+--  @setting mobs_griefing
+--  @settype bool
+--  @default false
+cmer.griefing = core.settings:get_bool("mobs_griefing", false)

mods/libs/cmer/settingtypes.txt

@@ -5,4 +5,7 @@ only_peaceful_mobs (Peaceful only) bool false
 creatures_enable_particles (Enable particles) bool false
 
 # Displays nametags above mobs.
-enable_mob_nametags (Enable mob nametags) bool false
+mobs_nametags (Enable mob nametags) bool false
+
+# Determines if owned entities can be killed by non-owners.
+mobs_griefing (Players can kill owned) bool false