From a10142907f07a387a50a07555e9298ee6b4aac54 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 10 Apr 2016 11:16:27 -0500 Subject: [PATCH 1/4] disallow building inside a vehicle --- Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf index d12c7be9..417c434f 100644 --- a/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf +++ b/Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf @@ -28,6 +28,9 @@ _buildingAllowed = true; _ownedJammerExists = false; _nearestJammer = objNull; +// reject building if in vehicle +if (vehicle player != player)exitWith{["Building Disallowed: Inside Vehicle", 5] call Epoch_dynamicText; false }; + // defaults _config = 'CfgEpochClient' call EPOCH_returnConfig; _buildingJammerRange = getNumber(_config >> "buildingJammerRange"); From 6d987836ad802431c9078060238e7ca1731be800 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Apr 2016 08:48:26 -0500 Subject: [PATCH 2/4] 0.3.8.0421 --- Changelogs/0.3.8.0.txt | 6 ++++++ .../@epochhive/addons/a3_epoch_server.pbo | Bin 387416 -> 387720 bytes .../addons/a3_epoch_server_settings.pbo | Bin 396563 -> 396563 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 12329 -> 12329 bytes Server_Install_Pack/MPMissions/epoch.Napf.pbo | Bin 909803 -> 910052 bytes .../mpmissions/epoch.Altis.pbo | Bin 909836 -> 910085 bytes .../mpmissions/epoch.Australia.pbo | Bin 908064 -> 908313 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 909151 -> 909400 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 908998 -> 909247 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 908972 -> 909221 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 908979 -> 909228 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 909124 -> 909373 bytes .../mpmissions/epoch.Esseker.pbo | Bin 908964 -> 909213 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 909391 -> 909640 bytes .../mpmissions/epoch.Porto.pbo | Bin 909115 -> 909364 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 909126 -> 909375 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 909388 -> 909637 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 909390 -> 909639 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 909393 -> 909642 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 909118 -> 909367 bytes .../mpmissions/epoch.Stratis.pbo | Bin 908972 -> 909221 bytes .../mpmissions/epoch.Takistan.pbo | Bin 909080 -> 909329 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 908964 -> 909213 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 909391 -> 909640 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 909048 -> 909297 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 909111 -> 909360 bytes .../compile/building/EPOCH_staticMove.sqf | 4 +++- Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../epoch_player/EPOCH_server_loadPlayer.sqf | 10 ++++++++++ Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 33 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Changelogs/0.3.8.0.txt b/Changelogs/0.3.8.0.txt index 4844425b..416a30d0 100644 --- a/Changelogs/0.3.8.0.txt +++ b/Changelogs/0.3.8.0.txt @@ -42,3 +42,9 @@ [Info] epochAH.hpp updated "antihack_checkFiles" for new file paths. [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient. [Info] Removed old .bikey and added new one for 0380. + +Build: 421 +[Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled. +[Fixed] removeExec Battleye kick fixed. +[Fixed] Player getting stuck waiting for inventory to load. +[Fixed] Delete base object if over limit. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 0ded3e9f8e65bf37029f3902c56bda2e1317e60c..4e3480b5c11756f59bf5e1eca593d9aeed29b5d5 100644 GIT binary patch delta 353 zcmca{Nxb8#_yiy3`M-HK`v2!-yZDPIyh?ZSLN1l*H3G~+o4dHwxtSOK=GnYOw2YC( z$k1A0vZ8WmbF=vNW^u+%e3M=E#T2a+;>+`ka#D&55|dLER1KAMkod9Iyj;^6J(!fI zpG{$6pB|;g=m*jy1=N(2pPX2dnV$#I0^`MQU!cY)%F0@hlUSKL{ge))?DQ?#jNTwk z4nR$LspSDVl|?{33aUm5s>VReph7wb6Ll2QQ%eH!iycFJ;5xt#IXIg|WILY@<5kh= z7oRbTP1k?H#3c(7m!Q?!(R!pPyY!9qmC0`&sv3I;MUG%+(Xhw=Xchw=XdxAFf3gX$DdrI^n_7NXTK O^8(j`1wOp}nx0U!f;=4n diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index ca98bb14453b29b7d1b6b842de23d8b920b33b51..af04f14f77b70cadd47ac258e46cb53fe1bca9ff 100644 GIT binary patch delta 151 zcmbO{OJedYi3uSNOMdf&yD%^?B$a07r08W76ad)>um~v23*;u}=cQ$)>m{Q}12u1) zGMi1@#MHpd#6-!Om#Y?t!A9Ad7#TLZvA4UiGXgOa5HkZY3lOtzcVlPU$tv<~YO?CR UYk}rb7E28;ER1@zdacqH0AD#N<^TWy delta 151 zcmbO{OJedYi3uSN$KyG}T^JY`l1ejkQuHzk3V>_`I0lsE1#*+~^U^ZY^^(z~ftoi? znaw6{WN2b&Y^r3<%T)`+V54kJ49%O}*xTLM8G)Dyh?#+y1&CRRlR*L_v2JSu1E%{7liUJ90x~hP9|Pwp0j0ACEye)` jG&L|bG&Zx-EtU9|Pwp0im-8Eye)` jGBGqUGdHu-EDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|Xv)Jrvr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJK&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZZHZ+5lQFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= vvjZ^)5OV@C7Z7s;G0*lbrMxn^B5ukXLp<%~9B#9hy?O8UjsL0BI}ZQ=MJP)< diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index d54ebb99a22f3a9a6d07cf6e8816b28a67a2436e..7c3403b99c1743159fb2343a82853182def7d264 100644 GIT binary patch delta 320 zcmeA#29}}Id$fz<|yq$ORJ|;y*wuBvA;cs<8Vw*Wx zb{McN`^^*1%P@JPmDFT?Q_0Q0Ox!rxOiT^TObs@>*{Pe!7o}#UCYLBAm1gFoWagzS zWTq)(<|&k=W@IMkr1El2KVZo$%b8k{SrVREl2JYRW2H5(XI^n;N~%H_Sk3f>HB3qz z3TcTs#ib|B^e qVoo6D0%C3;=Gnf!gx51yB=!gY$Fd~dDOxL4H(hnCzoUBUL?Hl5A$73; delta 211 zcmZoYX5Mqee1aMC*?7*4mVQi=1(;cw*hMERGOBFe$fU;z=5N*o^Ep{|7_gm+=M3j% zn7q+SYO=nmjTQEyznu6l=_;5yf?$nCRlJLxujOtqJ z$&AYsnypT@Tb*PCVkRJF24a@&Rwr56*RU9xTPsX={K)J)-C#D0!gTH$HlFq^rEEaV u4#XTl%n8I?K+FxqJlnUF^4jK#lnb8tu~>3dxwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VGd14qW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZHm~3{lQ#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D v5VHd@2M}`tF&7YX12NC`Ev3AHX(HE(B-^*FHDHr%eC)}vkMSkjtt*cJ&cjJ^ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index e002ead2a64dfe89fe80b62ccbb36b4c60ae6f48..a4b69fc7fd05a9aadb7864adf6adbf0aefbec4f1 100644 GIT binary patch delta 320 zcmcb=&-}&#^9g3m8-Md`wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VGd17rW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=K0TKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZHSZsE)Q#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D w5VHd@2M}`tF&7YX12NC`Ev38@vP7OGGo*UF{ku`(+1%O-yHqnGJl5<00Afl@hyVZp diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index a89dafb67e4a135b521657bc3ea0e7e3eb48db13..ded4da0b072d5e953660947af428912e316b6e0c 100644 GIT binary patch delta 319 zcmX@M*L?qe^9g3mTYvLxwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XGu!NHr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJK&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZZHZg#cPFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= vvjZ^)5OV@C7Z7s;G0*lbrM%xWMPi?EC~@qZ+nc;HmTUL6DZhPGp4b8a`#4G+ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 615b4172788426e00ffa59a35b8a38f5934aa198..af61409fec52117f3d6037d990bf6c61fa806ae4 100644 GIT binary patch delta 319 zcmZ3p*L>-I^9g3mJAdDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XGu!NHr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJK&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZZHZg#cPFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= uvjZ^)5OV@C7Z7s;G0*lbrM!1DMeNhIyZV%K>Dk_|`ZxFOJyR!jUoQa9X-Px? diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 19f8de593f7673aa5cd2cc6bf43a02c85a7236a7..2c354c7d186efe5e56b1ff15d85bde68dafcf2de 100644 GIT binary patch delta 319 zcmdnI*L=->^9g3mdw%n5wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XGu!NHr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKTKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZZHZg#cPFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= vvjZ^)5OV@C7Z7s;G0*lbrMyovMZ(v*MTHz)a6fs@>a^;HQxA9koxc$P^kPhh diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index 88f9ddf2edf346f8234c293f6d37e483d429b4fb..bb19d37d03fd3600cd3a0616319642f5fbd81023 100644 GIT binary patch delta 320 zcmX@I&wTFz^9g3m2Y&NxwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VGdJ4oW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=KG!%HL^s^1|GoU#o+}2z(m??FKX%*z delta 211 zcmdmc!2HNQ^9g3m592vETKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZH8E$s7Q#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D v5VHd@2M}`tF&7YX12NC`Ev3ArSt1(@wp!mk_xMqDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VGdJDrW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZHnQV5mQ#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D v5VHd@2M}`tF&7YX12NC`Ev39yGevxSvt;(?IvzdjwSBGB%AlS@zRSe`{>Mqq diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index deecc201231d43499d2722e668f1e0f743179b26..136aa2dc7438c5924cf622bf0298cc21c4853750 100644 GIT binary patch delta 320 zcmX?q!2HA^^9g3m$A0r{wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VGq>36W~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=ECPIp>?&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZHS#EZ-Q#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D w5VHd@2M}`tF&7YX12NC`Ev38-*&@El?#r*eJj1`A!Kcvo^t{?Xw`?v0094dVeEDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VvoPE2W~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=iot^;iG<9YG delta 211 zcmdmTzU^9g3m@8dZ)TKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZZHn{IZqQ#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D w5VHd@2M}`tF&7YX12NC`Ev39USt9ogCwMX@2D-k#d;O;zm+or+M~_|r04tA5>Hq)$ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 491349b3553075199587d0eca5073597d11e42c5..3e6954181cf4ea942e1f98f69d4e47ffd31ed552 100644 GIT binary patch delta 320 zcmX@M&wT#@^9g3m7k~3?wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$Vv#{LkW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=-58MX;Adh#z delta 211 zcmdmg!2H-g^9g3mU*b78TKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZYc7;JX4Q#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D v5VHd@2M}`tF&7YX12NC`Ev3BWSt1RWZmoH&DWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VvozZ5W~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=dcy#gr delta 211 zcmX?l$o$L!^9g3m-{UzqTKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))>8JZYc7;kp7Q#aeJQ`#2Hl9{HUI6Xd`QJy=sBC{ksvm~Rs z)_OAIGKFTVlkHX~8G)Dyh?#+yWxLf$R`xY4hUV4^(;YuDJ5M*5&7v@!yM~RYeM>1D v5VHd@2M}`tF&7YX12NC`Ev3A**&=>*5vNmkvRU#8XPeB6xG(-_;r)03LFq|r diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index f193180e2625148c3adf26b3bc8f04d991209aba..cac3386313590fec8ec2646a594a6f08eca99c10 100644 GIT binary patch delta 319 zcmX?i!2I|j^9g3mH-7VMwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|Xv)t@zr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKp{acT4~P delta 210 zcmX?p$o$*^^9g3mzv4MJTKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZYcY<9KNFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= vvjZ^)5OV@C7Z7s;G0*lbrM&goBAZs||4`fW+Gr`u+svg#>#FYPZ}0~IH6%+9 diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index 158533cc723cea310c125e42e7e1871bb904c5dc..bd6e6438ab77f85e0d7df644dd512043569f3d36 100644 GIT binary patch delta 319 zcmcb3!2Hx9^9g3mw}10&wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|Xv)t@zr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKmkVo&eo8b|C-& delta 210 zcmX?g$o%2~^9g3mf8#kfTKX|f7GP#!Vi%pP$f&Y;Ba&U%;#j;VZe4Oo->@6 zVe&>Rsmc1LlAC{-xN))?8JZYcY<9KNFx#wC+7`@`nWmsPJwBXKo;$T7vm`vTB%`|4 zdNSiOg=VXh?N%olftU%1nSq#PyVXfn_BAYq=GF?+9X~QVPdAv&qA;DihK;9vODP)= uvjZ^)5OV@C7Z7s;G0*lbrMykqA}aqMmB{Dc>N1I_ny#UKcVF6iUkLy*!AbuB diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index a01108c171372ea054df4cc63310f7b99de95428..c74bbaf69a07b2eaace435ae8f9789038fe948e2 100644 GIT binary patch delta 319 zcmdnD&wTp<^9g3m_kZ(jwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XH`wfIr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKQJBtM!^YFTrIZbb v*@2h?h&h3n3y8Uam}mQzQr`S5kz+SmRBu>ImL}P47N31+*0Q@Z|7rjLL!?P& diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 969d280cd154cc282c1338ed25f55d962ed961d0..3549eddbb5443c83610dbb688a174de841f7b189 100644 GIT binary patch delta 320 zcmZ3p*L>-I^9g3mkAL%QwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VH!$DqW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=HLVugz^!4};RXQ1#&bRZ delta 211 zcmZ3w-+awp^9g3mED4+&E&Z4#3ox@Vv5QVtWK`L_kx7pc%-^gF=5w;_Fkm|s&l%3k zFnObu)MR~A$<4n^+&I~c3{4Cz%{IH)she%qDQyd8$xKsFoE{&}D9@c*ky#R+S&~s* zYdx89nL@MG$#$!gj6lo;#LPg5dJ{VUBkxHzNM56 vh}nUd1Bf|+mDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VH#FGnW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=5dJ{VUBkxHzNM56 vh}nUd1Bf|+m;!Fn{~xL7pc7F~~^R diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index aafea54bcb1d6e80e0a3756c7a7a2d9b17567637..3f72195480c86a946a66aa67504cc050d72e566e 100644 GIT binary patch delta 320 zcmZ3o*L?1N^9g3mZ-4V_wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VH#FbuW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=5vwiQh9|-~g;%#>( delta 211 zcmbQc-+akl^9g3md5dJ{VUBkxHzNM56 vh}nUd1Bf|+mDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XH`?rKr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKQJBtM!^YFTrIZbb u*@2h?h&h3n3y8Uam}mQzQr?Dak()|a9##Lg_!CmgRV}-#ZWHT1-g^LnBuWDS diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 55309abd5f61c52ff15cef575cac26933fa1b47d..4480134b5f546823ad1fb84ebab93ae98fc7ecd2 100644 GIT binary patch delta 320 zcmeyd*Zkvt^9g3mUw-p!wDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%Gch$VH!|7mW~Xi@UzD1anp~ogRGOKSl9`vT zkeQ~CnWs>envt2Dlgi6A{eUI2EN5y(W=VKvNk;YLkCoQEo_WQYDX9u!U^UYh)-Wk? zD5NFk6sIcGZcZ)f3s&Ui($`lAO3lqLOI65E0-FysHZQ+KAu%T>zdSW%^2g(P;tDCL zIjJS75Mxpm;-M;=5dJ{VUBkxHzNM56 vh}nUd1Bf|+m?jhjVvLt~sOkZr^19&{0WN diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index e410f40fc409333346f190847e52c1a4414eb1a8..95000e9d039fa12ff66667a258d31168990fe306 100644 GIT binary patch delta 319 zcmdnK&wRrH^9g3mFMsoFwDeDWiEZX& z*^Dz1FT>=GR#KDoO(i$~GI8T%H8C|XH{9%Mr(q^vl$w>AT%wRvnwgW5nU}7R znWm7Lr%;xfk(r#6%F8wVfF-jmXKF=eNqA;SM)l;6mDaqTdBvG2sS06WHPaW?Fez~; zq$TDQrz+HLPA%yRR^;W<*H;Ki&CM@MRme{Qn-4TLFTX?~F()U#JT+zV$K!h93Mr{M zsU@ipV^S63p(>l@PqfRQU<6_&AZ7+)mhJKuWNZAw|9n8tZUC8ZbmRa4 delta 210 zcmdmRzQJBtM!^YFTrIZbb u*@2h?h&h3n3y8Uam}mQzQr?U#kNeed Energy", 5] call Epoch_dynamicText; }; -if !("" call EPOCH_isBuildAllowed) exitWith{}; + +// Remove object if not allowed +if !("" call EPOCH_isBuildAllowed) exitWith{ deleteVehicle _object }; EPOCH_simulSwap_Lock = true; _objType = typeOf _object; diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 9826e271..2ba065e2 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=417; +build=421; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 9826e271..2ba065e2 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=417; +build=421; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 3042a18a..60e69619 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -86,10 +86,14 @@ if (_this isEqualType []) then { _dir = _worldspace select 0; _location = _worldspace select 1; + diag_log format["DEBUG: _worldspace %1",_worldspace]; + if (count _location == 2) then{ _location = (_location select 0) vectorAdd (_location select 1); }; + diag_log format["DEBUG: _location %1",_location]; + _prevInstance = _worldspace select 2; _medical = _arr select 1; _server_vars = _arr select 3; @@ -135,7 +139,11 @@ if (_this isEqualType []) then { _group = createGroup west; }; + _player setPosATL _location; + _newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"]; + diag_log format["DEBUG: _newPlyr %1 %2 %3",_newPlyr, _location, getPosATL _newPlyr]; + if !(isNull _newPlyr) then { addToRemainsCollector[_newPlyr]; @@ -326,6 +334,8 @@ if (_this isEqualType []) then { [_playerNetID, _playerUID, [_newPlyr, _vars, _currWeap, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray]] call EPOCH_server_pushPlayer; _newPlyr setVariable["SETUP", true, true]; + + diag_log format["DEBUG: _newPlyr SETUP %1",_newPlyr]; }; } else { diag_log format["LOGIN FAILED UNIT NULL: %1 [%2|%3]", _player, _group, count allgroups]; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 9826e271..2ba065e2 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=417; +build=421; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 9826e271..2ba065e2 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=417; +build=421; diff --git a/build.txt b/build.txt index 763351a2..03017e9f 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -417 +421 From a71353b8aeae93a04cd3f36b0a5775beef95bd6e Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Apr 2016 08:49:39 -0500 Subject: [PATCH 3/4] changelog --- Changelogs/0.3.8.0.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelogs/0.3.8.0.txt b/Changelogs/0.3.8.0.txt index 416a30d0..b180aba0 100644 --- a/Changelogs/0.3.8.0.txt +++ b/Changelogs/0.3.8.0.txt @@ -44,6 +44,7 @@ [Info] Removed old .bikey and added new one for 0380. Build: 421 +[Fixed] Disallow building inside of vehicles. [Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled. [Fixed] removeExec Battleye kick fixed. [Fixed] Player getting stuck waiting for inventory to load. From e7de25b0f4c8cf2f5bcdb0cf4695620fccd3941e Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 12 Apr 2016 08:53:17 -0500 Subject: [PATCH 4/4] 0.3.8.0422 remove debug --- Changelogs/0.3.8.0.txt | 2 +- .../@epochhive/addons/a3_epoch_server.pbo | Bin 387720 -> 387545 bytes .../addons/a3_epoch_server_settings.pbo | Bin 396563 -> 396563 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 12329 -> 12329 bytes Server_Install_Pack/MPMissions/epoch.Napf.pbo | Bin 910052 -> 910052 bytes .../mpmissions/epoch.Altis.pbo | Bin 910085 -> 910085 bytes .../mpmissions/epoch.Australia.pbo | Bin 908313 -> 908313 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 909400 -> 909400 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 909247 -> 909247 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 909221 -> 909221 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 909228 -> 909228 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 909373 -> 909373 bytes .../mpmissions/epoch.Esseker.pbo | Bin 909213 -> 909213 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 909640 -> 909640 bytes .../mpmissions/epoch.Porto.pbo | Bin 909364 -> 909364 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 909375 -> 909375 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 909637 -> 909637 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 909639 -> 909639 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 909642 -> 909642 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 909367 -> 909367 bytes .../mpmissions/epoch.Stratis.pbo | Bin 909221 -> 909221 bytes .../mpmissions/epoch.Takistan.pbo | Bin 909329 -> 909329 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 909213 -> 909213 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 909640 -> 909640 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 909297 -> 909297 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 909360 -> 909360 bytes Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../epoch_player/EPOCH_server_loadPlayer.sqf | 8 +------- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- build.txt | 2 +- 32 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Changelogs/0.3.8.0.txt b/Changelogs/0.3.8.0.txt index b180aba0..5bfd84c9 100644 --- a/Changelogs/0.3.8.0.txt +++ b/Changelogs/0.3.8.0.txt @@ -43,7 +43,7 @@ [Info] Some AI Scripts Mods may not work with disableRemoteSensors enabled. You can disable with "disableRemoteSensors = false;" in CfgEpochClient. [Info] Removed old .bikey and added new one for 0380. -Build: 421 +Build: 422 [Fixed] Disallow building inside of vehicles. [Fixed] Incorrectly enabled CUP vehicles and weapons support if only Core and Maps where enabled. [Fixed] removeExec Battleye kick fixed. diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 4e3480b5c11756f59bf5e1eca593d9aeed29b5d5..21c080a245f2eccef335188a4300f22871c1a7d6 100644 GIT binary patch delta 150 zcmV;H0BQe-)fd^*7m!Q>TK%C;3I<613|Gr6lc5SEm#h&360?d5Ckp~x{j;+bcmV@4 zJ0O!GBUOWg7q^2K0kRI4Hc0{=myad^Rks``0eS_OP3Zz0x34S#CKi`O4gwj6EJFde zEJFg-u>q#H0`&sx3Is7QI5dax{{n~c{{y%2{{(~T6!ow@jy5AOtrlrLbg47N8&&Ex ELEV@)!2kdN delta 248 zcmcb4S-j(__yixO`M($Xaj{+e#S>noJ9#0O%Jjbi%tD*HxYW6s7XIG6S+s(Y+0a^H zvZ8WmbF=vNW^u+%e3M=E#pJ9M;>+`ka#D&55|dLER1KAMkod9Fb=4TFLF%M{>T>dv z6H7Al^B}5Vyx8pv)EJvsL5j9p>o97HOG>lj1Y=l^E{V&?7h|FfvQ64}hl8CWne S>~m(eCG(RnjQlL3Q*8k4=2Z#+ diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index af04f14f77b70cadd47ac258e46cb53fe1bca9ff..9160503f5845a28c989a97eb6631005ae185f8ff 100644 GIT binary patch delta 148 zcmbO{OJedYi3uV0aesNjT^JY`l1ejkQuHzk3V>_`hylv-0=dcgd1;yHddX>gQub}> S%I|x&dPMEMC}(num~v23*;u}=cQ$)>m{Q}FZsQ3 z@;o+C12Yp7C2L-;S|A3SV{2k$*zCsM?#9jt#7scU48$xz%(~r;ooy$p$hWDe1@8N?QO194T-B diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index a1dedb9609e1065a6bd568b77c8ce4f997f9d809..4039492df7ba596c92e3659abaf84cccf1815379 100644 GIT binary patch delta 73 zcmV-P0Ji_BV5wk`MFw8|3|9>RlR*L_v2JSu0$}}<+X6!YGP558=P3cEvj;860R%BH fI5@M@ERlR*L_v2JSu0;cZgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX j#5~)#l=8~tiZHku*5BP_)5vChA!lx8!C`*~>00^}DV;6-(cyF7zJ&&sjCn diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 7c3403b99c1743159fb2343a82853182def7d264..81f29db2ecf7ce874b56ce289faf1ecbdede9eac 100644 GIT binary patch delta 143 zcmZoYX5MvlIgwm)XfM%D_`9X~QVPdAv&qA;DihK;9vODP)=vjZ^)5OV@C7Z7s; iG0*lbrM$MeBHcZgz}7 z%ml>DK+FQftlQn}*#4L?8(J$&cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX j#5~)#l=9lZYrX^>Zgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX j#5~)#l=23qi7e)KZn?@}F7@fC`_7AV?*0o;`CbG79?LcV delta 143 zcmbQa!+hor^9g25YkzOF=rmzl_M0c1mtpcoE2+u)rjna~nRsxr7?_zFH@n%jyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qpy{cCc^tK_~gwqu8K`|cdtjJu2{ihuDk>QZP7J) diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index a4b69fc7fd05a9aadb7864adf6adbf0aefbec4f1..10e75ae10c4b9157c04c76958bef658f6b1a830d 100644 GIT binary patch delta 142 zcmca{!2HGm^9g25nSVE0begaw{N)MfWthCtN@}vcspRHgCLWy3h6a|+u6FINc8oyG z1jNih%mT!$+geh*A~h$thR4H=r#GS)GfXT-;DvTJ~yNQ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index ded4da0b072d5e953660947af428912e316b6e0c..1799e044e85a30b825e92d5e3a8c441e0289d11f 100644 GIT binary patch delta 142 zcmdnL-+cdm^9g25xqmlWbegaw{N)MfWthCtN@}vcspRHgCLWy3hK2^su6FINc8oyG z1jNih%mT!$+gt=bb~Q}^ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index af61409fec52117f3d6037d990bf6c61fa806ae4..b52251abfa6f400354e558061579b6bddc482f03 100644 GIT binary patch delta 143 zcmZ3w-+bwQ^9g251%EeMbegaw{N)MfWthCtN@}vcspRHgCLWwDhK2?v&2Dz>Zgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX i#5~)#l=9xq6sZ-f(rL0h&BEu>u;Eg3erKz^yC489k28V* delta 143 zcmZ3w-+bwQ^9g25JAZGq=rmzl_M0c1mtpcoE2+u)rjna~nRsxr7?_!vHoMuiyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp$TbQ$+Yz(?cJvCn7@nIv&+WZlye{TxJXah<-KE diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index 2c354c7d186efe5e56b1ff15d85bde68dafcf2de..6c8d80143f39b7015238d56d60b2ce6ba4bb3920 100644 GIT binary patch delta 142 zcmZ3p-+aw}^9g25C4VTnbegaw{N)MfWthCtN@}vcspRHgCLWy3hK7dCu6FINc8oyG z1jNih%mT!$+gX6U3e|x&r{1xHRhk diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 99cdd6084248e3b9a795ce60cd8cc3f04a7f081b..25fd1b54ed7ab0a39eb5040708fa0e47041d64f1 100644 GIT binary patch delta 143 zcmdmTzZgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX j#5~)#l=9|eiCmbzF|_K~3WM&;pM@1C%m}FQ@xBHCX7x5F delta 143 zcmdmTzZgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX j#5~)#l=7BmiLAEC_#1opvB;{E)eY}HRad)xxN;Z(ev~*@ delta 143 zcmdmgzZgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX i#5~)#l=9YQi<~fUa-M6~KGnf*PMD!f^g>3iL$3i|U^El} delta 143 zcmX?l$o%Lb^9g25SAK7_=rmzl_M0c1mtpcoE2+u)rjna~nRsxr7?@caHM`lhyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp#JKEfUMkE_HF%mpL2QIA3i$rQxOgi8UAit~xas diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index cac3386313590fec8ec2646a594a6f08eca99c10..cc18ac475c90b7b7483beba5a853abb949d5a776 100644 GIT binary patch delta 143 zcmX?p$o%*r^9g25eSbGvbegaw{N)MfWthCtN@}vcspRHgCLWwDhK9x_&2Dz>Zgz}7 z%ml>DK+FQftlQn}*#4L?8(Aw%cl^lgJl$Y6i^6p78aAHxEv0Ng%nrmHK+FlmTtLhX i#5~)#l=9YRi|AR%Tzp#A)m~L7@b6xc%%O_!uk8VJ<2Hf- delta 143 zcmX?p$o%*r^9g25H-2xl=rmzl_M0c1mtpcoE2+u)rjna~nRsxr7?@d_HM`lhyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp#JOEmGGT(PR3uab?nsWhWQc)}AwLU%V0k%@a4N diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index bd6e6438ab77f85e0d7df644dd512043569f3d36..9cd4b5ec9d5f12fc54541a40281dc6bd9fa4cb6a 100644 GIT binary patch delta 143 zcmX?g$o$kH^9g25lm2eB=rmzV_{$T{%P@JPmDFT?Q_0Q0OguPQ3=NGfn%(T$-Ru~F zmq~YfS41Axqz4( jhq~YfS41Axqz4( jhLvH@n%jyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp%g3CF1;PVv$nVA%k)$|4El*cD`JB`hO?@sj4>3 diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 3549eddbb5443c83610dbb688a174de841f7b189..1bc4276021637699fccbc218fbae952d1f66f468 100644 GIT binary patch delta 143 zcmZ3w-+bwQ^9g25GyZP0=rmzV_{$T{%P@JPmDFT?Q_0Q0OguPQ3=K_8n%(T$-Ru~F zmq~YfS41Axqz4( jhNFH@n%jyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o i5c6!`Qp$TbQ)Id8w-n_#9a&!irKZ(l8@M$LJKO+^JTqhf diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 9f747efd79f909053437fa8466f8be244d115e05..85c0f4470df09c40bdf5768e6b0fd2e209e8bde8 100644 GIT binary patch delta 143 zcmbPuzq~YfS41Axqz4( jhLxG`rcgyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o i5c6!`Qp)R@C2}&rQoBvQg5k^b#@?9fJCUAq%q~YfS41Axqz4( jhNHH@n%jyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp$TZQ>5kfY^jGKNwbc*)~&OAVz%#{_9H<6t$#O6 diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index ac876254e4a1ec4f778507b97e0687abd8b4c57d..48ec50772e7aa5a20857e4966f544e7e6b38d928 100644 GIT binary patch delta 143 zcmX?c$o#}1^9g25%l~e)=rmzV_{$T{%P@JPmDFT?Q_0Q0OguPQ3=K^!o89c%-Ru~F zmq~YfS41Axqz4( jhLwG`rcgyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp($qEfTVF(VNvDKl~C*IAuP0O~AMIYfA9|>E$?& diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 4480134b5f546823ad1fb84ebab93ae98fc7ecd2..979d20dc936bb152668e6a27be8824bde4915fa4 100644 GIT binary patch delta 143 zcmeyk-~8i#^9g25tNw1Z=rmzV_{$T{%P@JPmDFT?Q_0Q0OguPQ3=PeUn%(T$-Ru~F zmq~YfS41Axqz4( jhNGG`rcgyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp&5DCE}%2b$-?1FX7L`6nbAAU|Vw4b;V-<`Gz;L diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 95000e9d039fa12ff66667a258d31168990fe306..5b8fab129beec60771d6a4c9d4079568e7a7cdbe 100644 GIT binary patch delta 143 zcmdmRzq~YfS41Axqz4( jhLxH@n%jyV)@U zF%u9o12GE_vu<~@WBX&qY-p`8-SH!{^K^sREDF=PYuI?&x0JF0F*^`*05K;Ja{)0o j5c6!`Qp%f=C9+NVAsdg>YrgX~cAIRCU-+L7=-CYbnP@dW diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index 2ba065e2..4cb1a87a 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=421; +build=422; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index 2ba065e2..4cb1a87a 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=421; +build=422; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 60e69619..46075438 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -86,14 +86,10 @@ if (_this isEqualType []) then { _dir = _worldspace select 0; _location = _worldspace select 1; - diag_log format["DEBUG: _worldspace %1",_worldspace]; - if (count _location == 2) then{ _location = (_location select 0) vectorAdd (_location select 1); }; - diag_log format["DEBUG: _location %1",_location]; - _prevInstance = _worldspace select 2; _medical = _arr select 1; _server_vars = _arr select 3; @@ -142,7 +138,7 @@ if (_this isEqualType []) then { _player setPosATL _location; _newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"]; - diag_log format["DEBUG: _newPlyr %1 %2 %3",_newPlyr, _location, getPosATL _newPlyr]; + // diag_log format["DEBUG: _newPlyr %1 %2 %3",_newPlyr, _location, getPosATL _newPlyr]; if !(isNull _newPlyr) then { @@ -334,8 +330,6 @@ if (_this isEqualType []) then { [_playerNetID, _playerUID, [_newPlyr, _vars, _currWeap, loadAbs _newPlyr, _playerGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken,_playerGroupArray]] call EPOCH_server_pushPlayer; _newPlyr setVariable["SETUP", true, true]; - - diag_log format["DEBUG: _newPlyr SETUP %1",_newPlyr]; }; } else { diag_log format["LOGIN FAILED UNIT NULL: %1 [%2|%3]", _player, _group, count allgroups]; diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index 2ba065e2..4cb1a87a 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=421; +build=422; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index 2ba065e2..4cb1a87a 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=421; +build=422; diff --git a/build.txt b/build.txt index 03017e9f..2e5658d0 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -421 +422