Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

- Place à nouveau la barre au dessus de la tête du joueur.

CHANGELOG.md

@@ -7,16 +7,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [1.0.2] - 2020-01-16
-
-### Fixed
-
-- Fix crash when creating an entity if a player leaves the server quickly.
-
-### Changed
-
-- Restore Minetest 0.4.17 support. The version check works only with `minetest_game` with the `player_api` mod added in Minetest 5.0.
-
 ## [1.0.1] - 2020-01-01
 
 ### Changed

README.md

@@ -60,7 +60,7 @@ on that line.
 
 ## Version compatibility
 
-Gauges is currently primarily tested with Minetest 5.1.0 and 0.4.17. It may or may not work
+Gauges is currently primarily tested with Minetest 5.1.0. It may or may not work
 with newer or older versions. Issues arising in versions older than 5.0.0
 will generally not be fixed.
 

init.lua

@@ -21,13 +21,12 @@ minetest.register_entity("gauges:hp_bar", {
 
 	on_step = function(self)
 		local player = self.wielder
-		local gauge = self.object
 
 		if not player or
 				not minetest.is_player(player) or
-				vector_distance(player:get_pos(), gauge:get_pos()) > 3
+				vector_distance(player:get_pos(), self.object:get_pos()) > 3
 		then
-			gauge:remove()
+			self.object:remove()
 			return
 		end
 
@@ -35,7 +34,7 @@ minetest.register_entity("gauges:hp_bar", {
 		local breath = player:get_breath() <= 10 and player:get_breath() or 11
 
 		if self.hp ~= hp or self.breath ~= breath then
-			gauge:set_properties({
+			self.object:set_properties({
 				textures = {
 					"health_"..tostring(hp)..".png^"..
 					"breath_"..tostring(breath)..".png"
@@ -48,16 +47,14 @@ minetest.register_entity("gauges:hp_bar", {
 })
 
 local function add_gauge(player)
-	if player and minetest.is_player(player) then
-		local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
-		-- check for minetest_game 0.4.*
-		local height = minetest.get_modpath("player_api") and 19 or 9
+	local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
 
-		entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0})
-		entity:get_luaentity().wielder = player
-	end
+	entity:set_attach(player, "", {x=0, y=19, z=0}, {x=0, y=0, z=0})
+	entity:get_luaentity().wielder = player
 end
 
 minetest.register_on_joinplayer(function(player)
 	minetest.after(1, add_gauge, player)
 end)
+
+minetest.log("action", "[gauges] loaded.")