Sync - Block send custom to host

DrNewbie · Nov 14, 2017 · 68c1baf · 68c1baf
1 parent 055b89f
commit 68c1baf
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 24 deletions.
diff --git a/...arket/icons/grenades/frag_cluster.texture → ...arket/icons/grenades/frag_cluster.texture b/...arket/icons/grenades/frag_cluster.texture → ...arket/icons/grenades/frag_cluster.texture
diff --git a/...grenade_com/wpn_frag_grenade_cluster.unit → ...grenade_com/wpn_frag_grenade_cluster.unit b/...grenade_com/wpn_frag_grenade_cluster.unit → ...grenade_com/wpn_frag_grenade_cluster.unit
diff --git a/ClusterBomb/Hooks/fraggrenade.lua → Module/ClusterBomb/Hooks/fraggrenade.lua b/ClusterBomb/Hooks/fraggrenade.lua → Module/ClusterBomb/Hooks/fraggrenade.lua
diff --git a/ClusterBomb/Hooks/tweakdata.lua → Module/ClusterBomb/Hooks/tweakdata.lua b/ClusterBomb/Hooks/tweakdata.lua → Module/ClusterBomb/Hooks/tweakdata.lua
diff --git a/ClusterBomb/Loc/english.txt → Module/ClusterBomb/Loc/english.txt b/ClusterBomb/Loc/english.txt → Module/ClusterBomb/Loc/english.txt
diff --git a/ClusterBomb/main.xml → Module/ClusterBomb/main.xml b/ClusterBomb/main.xml → Module/ClusterBomb/main.xml
diff --git a/...kmarket/icons/grenades/frag_taser.texture → ...kmarket/icons/grenades/frag_taser.texture b/...kmarket/icons/grenades/frag_taser.texture → ...kmarket/icons/grenades/frag_taser.texture
diff --git a/...g_grenade_com/wpn_frag_grenade_taser.unit → ...g_grenade_com/wpn_frag_grenade_taser.unit b/...g_grenade_com/wpn_frag_grenade_taser.unit → ...g_grenade_com/wpn_frag_grenade_taser.unit
diff --git a/TaserFrag/Hooks/explosionmanager.lua → Module/TaserFrag/Hooks/explosionmanager.lua b/TaserFrag/Hooks/explosionmanager.lua → Module/TaserFrag/Hooks/explosionmanager.lua
diff --git a/TaserFrag/Hooks/fraggrenade.lua → Module/TaserFrag/Hooks/fraggrenade.lua b/TaserFrag/Hooks/fraggrenade.lua → Module/TaserFrag/Hooks/fraggrenade.lua
diff --git a/TaserFrag/Hooks/tweakdata.lua → Module/TaserFrag/Hooks/tweakdata.lua b/TaserFrag/Hooks/tweakdata.lua → Module/TaserFrag/Hooks/tweakdata.lua
diff --git a/TaserFrag/Loc/english.txt → Module/TaserFrag/Loc/english.txt b/TaserFrag/Loc/english.txt → Module/TaserFrag/Loc/english.txt
diff --git a/TaserFrag/add.xml → Module/TaserFrag/add.xml b/TaserFrag/add.xml → Module/TaserFrag/add.xml
diff --git a/TaserFrag/main.xml → Module/TaserFrag/main.xml b/TaserFrag/main.xml → Module/TaserFrag/main.xml
diff --git a/assets/mod_overrides/AddOnThrowablesSync/Hooks/basenetworksession.lua b/assets/mod_overrides/AddOnThrowablesSync/Hooks/basenetworksession.lua
@@ -1,5 +1,5 @@
 function BaseNetworkSession:check_send_outfit(peer)
-	local FakeSyncFix = function(d1, d2, ...)
+	local FakeSyncFixOutfit = function(d1, d2, ...)
 		if tostring(d1) == 'sync_outfit' then
 			local _blackmarket_outfit = managers.blackmarket:unpack_outfit_from_string(d2)
 			local _grenade_id = tostring(_blackmarket_outfit.grenade)
@@ -11,7 +11,7 @@ function BaseNetworkSession:check_send_outfit(peer)
 		return d1, d2, ...
 	end
 	if managers.blackmarket:signature() then
-		local d1, d2 = FakeSyncFix("sync_outfit", managers.blackmarket:outfit_string())
+		local d1, d2 = FakeSyncFixOutfit("sync_outfit", managers.blackmarket:outfit_string())
 		if peer then
 			peer:send_queued_sync(d1, d2, self:local_peer():outfit_version(), managers.blackmarket:signature())
 		else
@@ -21,20 +21,6 @@ function BaseNetworkSession:check_send_outfit(peer)
 end
 
 function BaseNetworkSession:send_to_peers_synched(...)
-	local FakeSyncFix = function(d1, d2, ...)
-		if tostring(d1) == 'sync_grenades' then
-			if tweak_data.blackmarket.projectiles[d2].custom then
-				d2 = tweak_data.blackmarket.projectiles[d2].base_on or 'concussion'
-			end
-		end
-		if tostring(d1) == 'sync_unit_event_id_16' and d2 and d2.name and d2:name() then
-			local _d2 = tostring(d2:name():key())
-			if tweak_data.blackmarket.custom_projectiles[_d2] then
-				d2 = nil
-			end
-		end
-		return d1, d2, ...
-	end
 	for peer_id, peer in pairs(self._peers) do
 		peer:send_queued_sync(FakeSyncFix(...))
 	end

diff --git a/assets/mod_overrides/AddOnThrowablesSync/Hooks/clientnetworksession.lua b/assets/mod_overrides/AddOnThrowablesSync/Hooks/clientnetworksession.lua
@@ -0,0 +1,7 @@
+function ClientNetworkSession:send_to_host(...)
+	if self._server_peer then
+		self._server_peer:send(FakeSyncFix(...))
+	else
+		print("[ClientNetworkSession:send_to_host] no host")
+	end
+end
diff --git a/assets/mod_overrides/AddOnThrowablesSync/Hooks/networkpeer.lua b/assets/mod_overrides/AddOnThrowablesSync/Hooks/networkpeer.lua
@@ -1,18 +1,40 @@
-function NetworkPeer:send_queued_sync(...)
-	local FakeSyncFix = function(d1, d2, ...)
-		if tostring(d1) == 'sync_grenades' then
-			if tweak_data.blackmarket.projectiles[d2].custom then
-				d2 = tweak_data.blackmarket.projectiles[d2].base_on or 'concussion'
-			end
+function FakeSyncFix(d1, d2, d3, d4, d5, ...)
+	local _d1 = tostring(d1)
+	if _d1 == 'sync_grenades' then
+		local projectile_tweak = tweak_data.blackmarket.projectiles[tostring(d2)]
+		if projectile_tweak and projectile_tweak.custom then
+			d2 = projectile_tweak.base_on or 'concussion'
 		end
-		if tostring(d1) == 'sync_unit_event_id_16' and d2 and d2.name and d2:name() then
+	elseif _d1 == 'sync_unit_event_id_16' and d2 and d2.name and d2:name() then
+		local _d2 = tostring(d2:name():key())
+		if tweak_data.blackmarket.custom_projectiles[_d2] then
+			d2 = nil
+		end
+	elseif _d1 == 'sync_throw_projectile' then
+		if d2 and d2.name and d2:name() then
 			local _d2 = tostring(d2:name():key())
 			if tweak_data.blackmarket.custom_projectiles[_d2] then
 				d2 = nil
 			end
 		end
-		return d1, d2, ...
+		if d5 then
+			local projectile_entry = tostring(tweak_data.blackmarket:get_projectile_name_from_index(d5))
+			local projectile_tweak = tweak_data.blackmarket.projectiles[projectile_entry]
+			if projectile_tweak and projectile_tweak.custom then
+				d5 = tweak_data.blackmarket:get_index_from_projectile_id(tweak_data.blackmarket.projectiles[projectile_entry].base_on or 'concussion')
+			end
+		end
+	elseif _d1 == 'request_throw_projectile' then
+		local projectile_entry = tostring(tweak_data.blackmarket:get_projectile_name_from_index(d2))
+		local projectile_tweak = tweak_data.blackmarket.projectiles[projectile_entry]
+		if projectile_tweak and projectile_tweak.custom then
+			d2 = tweak_data.blackmarket:get_index_from_projectile_id(tweak_data.blackmarket.projectiles[projectile_entry].base_on or 'concussion')
+		end
 	end
+	return d1, d2, d3, d4, d5, ...
+end
+
+function NetworkPeer:send_queued_sync(...)
 	if not self._ip_verified then
 		Application:error("[NetworkPeer:send_queued_sync] ip unverified:", ...)
 		return

diff --git a/assets/mod_overrides/AddOnThrowablesSync/main.xml b/assets/mod_overrides/AddOnThrowablesSync/main.xml
@@ -1,5 +1,6 @@
 <mod name="AddOnThrowablesSync" global_key="AddOnThrowablesSync">
 	<Hooks directory="Hooks">
+        <hook file="clientnetworksession.lua" source_file="lib/network/base/clientnetworksession"/>
         <hook file="blackmarketmanager.lua" source_file="lib/managers/blackmarketmanager"/>
         <hook file="basenetworksession.lua" source_file="lib/network/base/basenetworksession"/>
 		<hook file="networkpeer.lua" source_file="lib/network/base/networkpeer"/>