player right-click handler by sorcerykid

builtin/game/register.lua

@@ -595,6 +595,7 @@ core.registered_on_modchannel_message, core.register_on_modchannel_message = mak
 core.registered_on_auth_fail, core.register_on_auth_fail = make_registration()
 core.registered_on_player_inventory_actions, core.register_on_player_inventory_action = make_registration()
 core.registered_allow_player_inventory_actions, core.register_allow_player_inventory_action = make_registration()
+core.registered_on_rightclickplayers, core.register_on_rightclickplayer = make_registration()
 
 --
 -- Compatibility for on_mapgen_init()

src/content_sao.cpp

@@ -1290,6 +1290,15 @@ int PlayerSAO::punch(v3f dir,
 	return hitparams.wear;
 }
 
+void PlayerSAO::rightClick(ServerActiveObject *clicker)
+{
+	PlayerSAO *playersao = m_player->getPlayerSAO();
+
+	if (isAttached())
+		return;
+	m_env->getScriptIface()->on_rightclickplayer(playersao, clicker);
+}
+
 s16 PlayerSAO::readDamage()
 {
 	s16 damage = m_damage;

src/content_sao.h

@@ -255,7 +255,7 @@ class PlayerSAO : public UnitSAO
 		const ToolCapabilities *toolcap,
 		ServerActiveObject *puncher,
 		float time_from_last_punch);
-	void rightClick(ServerActiveObject *clicker) {}
+	void rightClick(ServerActiveObject *clicker);
 	void setHP(s16 hp, const PlayerHPChangeReason &reason);
 	void setHPRaw(s16 hp) { m_hp = hp; }
 	s16 readDamage();

src/script/cpp_api/s_player.cpp

@@ -77,6 +77,19 @@ bool ScriptApiPlayer::on_punchplayer(ServerActiveObject *player,
 	return readParam<bool>(L, -1);
 }
 
+void ScriptApiPlayer::on_rightclickplayer(ServerActiveObject *player,
+		ServerActiveObject *clicker)
+{
+	SCRIPTAPI_PRECHECKHEADER
+	// Get core.registered_on_rightclickplayers
+	lua_getglobal(L, "core");
+	lua_getfield(L, -1, "registered_on_rightclickplayers");
+	// Call callbacks
+	objectrefGetOrCreate(L, player);
+	objectrefGetOrCreate(L, clicker);
+	runCallbacks(2, RUN_CALLBACKS_MODE_FIRST);
+}
+
 s16 ScriptApiPlayer::on_player_hpchange(ServerActiveObject *player,
 	s16 hp_change, const PlayerHPChangeReason &reason)
 {

src/script/cpp_api/s_player.h

@@ -46,6 +46,8 @@ class ScriptApiPlayer : virtual public ScriptApiBase
 	bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter,
 			float time_from_last_punch, const ToolCapabilities *toolcap,
 			v3f dir, s16 damage);
+	void on_rightclickplayer(ServerActiveObject *player,
+			ServerActiveObject *clicker);
 	s16 on_player_hpchange(ServerActiveObject *player, s16 hp_change,
 			const PlayerHPChangeReason &reason);
 	void on_playerReceiveFields(ServerActiveObject *player,