From 0c166a526884d893ea8df846cd855e4aee5e50ab Mon Sep 17 00:00:00 2001
From: MewMew <mail@mewmew.net>
Date: Sat, 5 Oct 2019 04:18:18 +0200
Subject: [PATCH] mirror fix, voting fix

---
 maps/biter_battles_v2/config.lua          | 2 +-
 maps/biter_battles_v2/difficulty_vote.lua | 7 ++++---
 maps/biter_battles_v2/main.lua            | 1 -
 maps/biter_battles_v2/mirror_terrain.lua  | 1 +
 modules/difficulty_vote.lua               | 3 ++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/maps/biter_battles_v2/config.lua b/maps/biter_battles_v2/config.lua
index f9aafc12..de225ce8 100644
--- a/maps/biter_battles_v2/config.lua
+++ b/maps/biter_battles_v2/config.lua
@@ -19,7 +19,7 @@ bb_config = {
 	["fast_pregen"] = false,	 						--Force fast pregeneration.
 
 	--TERRAIN OPTIONS--
-	["border_river_width"] = 25,						--Approximate width of the horizontal impassable river seperating the teams. (values up to 100)
+	["border_river_width"] = 27,						--Approximate width of the horizontal impassable river seperating the teams. (values up to 100)
 	["builders_area"] = true,							--Grant each side a peaceful direction with no nests and biters?
 	["random_scrap"] = true,							--Generate harvestable scrap around worms randomly?
 
diff --git a/maps/biter_battles_v2/difficulty_vote.lua b/maps/biter_battles_v2/difficulty_vote.lua
index 64944e88..854ac47c 100644
--- a/maps/biter_battles_v2/difficulty_vote.lua
+++ b/maps/biter_battles_v2/difficulty_vote.lua
@@ -116,12 +116,13 @@ local function on_gui_click(event)
 	end
 	if event.element.type ~= "button" then return end
 	if event.element.parent.name ~= "difficulty_poll" then return end
-	if event.element.name == "close" then event.element.parent.destroy() return end		
-	local i = tonumber(event.element.name)
+	if event.element.name == "close" then event.element.parent.destroy() return end
+	if game.tick > timeout then event.element.parent.destroy() return end
+	local i = tonumber(event.element.name)	
 	game.print(player.name .. " has voted for " .. difficulties[i].name .. " difficulty!", difficulties[i].print_color)
 	global.difficulty_player_votes[player.name] = i
 	set_difficulty()
-	difficulty_gui()
+	difficulty_gui()	
 	event.element.parent.destroy()
 end
 	
diff --git a/maps/biter_battles_v2/main.lua b/maps/biter_battles_v2/main.lua
index bef61f49..99d45e64 100644
--- a/maps/biter_battles_v2/main.lua
+++ b/maps/biter_battles_v2/main.lua
@@ -3,7 +3,6 @@
 require 'utils.table'
 require "on_tick_schedule"
 require "maps.biter_battles_v2.config"
-require "modules.dynamic_landfill"
 require "modules.spawners_contain_biters" 
 require "modules.mineable_wreckage_yields_scrap"
 
diff --git a/maps/biter_battles_v2/mirror_terrain.lua b/maps/biter_battles_v2/mirror_terrain.lua
index 5ee77498..06d7d6e5 100644
--- a/maps/biter_battles_v2/mirror_terrain.lua
+++ b/maps/biter_battles_v2/mirror_terrain.lua
@@ -50,6 +50,7 @@ local valid_types = {
 }
 
 local function process_entity(surface, entity)
+	if not entity.valid then return end
 	if not valid_types[entity.type] then return end
 	local new_pos = {x = entity.position.x * -1, y = entity.position.y * -1}
 	if entity.type == "tree" then
diff --git a/modules/difficulty_vote.lua b/modules/difficulty_vote.lua
index 8a747641..d21fecbb 100644
--- a/modules/difficulty_vote.lua
+++ b/modules/difficulty_vote.lua
@@ -124,7 +124,8 @@ local function on_gui_click(event)
 	end
 	if event.element.type ~= "button" then return end
 	if event.element.parent.name ~= "difficulty_poll" then return end
-	if event.element.name == "close" then event.element.parent.destroy() return end	
+	if event.element.name == "close" then event.element.parent.destroy() return end
+	if game.tick > global.difficulty_poll_closing_timeout then event.element.parent.destroy() return end
 	local i = tonumber(event.element.name)
 	game.print(player.name .. " has voted for " .. difficulties[i].name .. " difficulty!", difficulties[i].print_color)
 	global.difficulty_player_votes[player.name] = i