From 2c49a8ad93ade9c69c68408f1688c3ce43bd3d52 Mon Sep 17 00:00:00 2001
From: vbawol <vbawol@veteranbastards.com>
Date: Fri, 24 Mar 2017 07:24:35 -0500
Subject: [PATCH] add previous location check

If you had set a spawnpoint previously at another location and attempt
to set a new one, it would say "spawnpoint removed" instead of "set".
---
 .../@epochhive/addons/epoch_server.pbo        | Bin 453905 -> 454057 bytes
 .../@epochhive/addons/epoch_server_core.pbo   | Bin 19236 -> 19236 bytes
 .../addons/epoch_server_settings.pbo          | Bin 482246 -> 482246 bytes
 Sources/epoch_server/build.hpp                |   2 +-
 .../epoch_player/EPOCH_server_makeSP.sqf      |   5 ++++-
 Sources/epoch_server_core/build.hpp           |   2 +-
 Sources/epoch_server_settings/build.hpp       |   2 +-
 build.txt                                     |   2 +-
 8 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo
index 02a6dac396ccdf9e92ebb3f22b9c4d8a38719273..1530d89c5e1493020fc82b7b727d7eec4179642e 100644
GIT binary patch
delta 322
zcmbPuOM2yP=?NapKY6cC^p<9OnRg|EpJC!&qmA>5x!GRxUX8G4pFELUW%{4p%tD)e
zd3t$3DmUMi2w`M;nK#*3Dp1PU*wWn8Sjn1~s}_jg@7|wOnwgVgYi?jM{h=9iSo0UD
z?O&uA7bS4VCzlo#rRJ3c<QGr>5yL23&&#C%1^W65nR#W2IhiSmC8-JpMX6<(`K84Q
z1^LC9C7Jno2!)wx3L5cQiMhF{MG7gI#U+V($*BrR1}oSp7#V0Plw_plDO96K*eXQF
zDu7%Fvon(yWER{_lM^*0rvLM0<Y~WF%?QLyK+FupEI`b<{aQ7fdZEbKkR1m!|4ovL
Q*e59Xyv_J$WBgNQ02bYJDF6Tf

delta 169
zcmZ2^TYBOx=?NapZ}YB9^p<9OZh9qxpJC!&qmA>5x!K<3UWr)FHhChq%4Tbx`8*&+
zo9{}5Ffu(ioop->C}m`6X<%%wWX;P}3&iht?@ubt%t^5|H!z>x_>VEH`HR%{FH($)
z5?C_R6f~y)j$xFX{;-uveEL6MMxOS(8b%;y0%B$$W&vW>?Rhn9>V+cyn|HCtZuWM2
Q!T3A;XUR?1J-U@105!Nm$p8QV

diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
index 8a037299b9989a77cdf9eab7eeda060e070462c3..cfc880377783759b36815324b78ab33de9008bdd 100644
GIT binary patch
delta 94
zcmZ27jd95|#tFX6|9G!X43K8}khd}SFcXM3*_b&7$elcqIZ(>j*wWn8Ldlw!s}_jg
w@7|wOnwgVgYi?jM`96EZ<`9-WZXz51ze$ZeoPBuq(S%j|eYbvLpB6L)0MfoEDgXcg

delta 94
zcmZ27jd95|#tFX6pYpCu43K7eWx6r<FcXM3*_b&7$elcqIZ(>T($c`hNXeR)s}_jg
v@7|wOnwgVgYi?jZ`96EZ<`9-WZX&f2r;~QaJX1&%2s|0Oz+m0%HF|FVzqTbi

diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
index d7c2fed3fc73d42c5e654a999017dd0c54bcf011..091d7c061734fb621c7206240acc60584875fece 100644
GIT binary patch
delta 140
zcmX@MUG~^^*$IIPOng@(To@P_l1ejkQuHzk3V>_`_?$PfP?i~}X5&O3cBapHlkc+!
zN*NnlnwuFZS@Uw$0`dFZ`@wo`%?&J?y*S#vI2eJL35c12m<5PgftYQ(7YBPru*kdP
X-^HF>ci5mC(Eg4$zNjLtjpIE4Ma?VD

delta 140
zcmX@MUG~^^*$IIPU-Pa+xG*p<B$a07r08W76ad)>@YZx<p)4~{&Blp7>`ZS>C*Nle
zlrplkG%zt$vgYNg1>*O+_k;D?nj4rmdvUaTaWDcg6A&{4F$)m00x{cmFAnyMV3FBY
Y4}!1uZhUig`@Zg|ZIxdh__yu>07|4V8vp<R

diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server/build.hpp
+++ b/Sources/epoch_server/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
index a7b4a3a8..f810daf5 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
@@ -23,7 +23,10 @@ if (_player distance _jammer > 20) exitWith{};
 if (alive _jammer) then {
     if ((_jammer getVariable["BUILD_OWNER", "-1"]) in [getPlayerUID _player, _player getVariable["GROUP", ""]]) then {
         _server_vars = _player getVariable["SERVER_VARS", []];
-        if (_server_vars param [0,[]] isEqualTo []) then {
+        _currentPos = _server_vars param [0,[]];
+        // invalidate previous position
+        if (_jammer distance _currentPos > 20) then { _currentPos = [] };
+        if (_currentPos isEqualTo []) then {
             // set position of spawnpoint to players SERVER_VARS
             _server_vars set [0, getposATL _jammer]; // 0 = RESPAWN POS
             _player setVariable ["SERVER_VARS", _server_vars];
diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server_core/build.hpp
+++ b/Sources/epoch_server_core/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server_settings/build.hpp
+++ b/Sources/epoch_server_settings/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/build.txt b/build.txt
index c5dba829..3a89277b 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-708
+709