Merge branch 'master' of github.com:RGLgg/server-resources-updater in…

…to beta

.github/workflows/main.yml

@@ -42,9 +42,11 @@ jobs:
 
       # TF2 Comp Fixes: https://github.com/ldesgoui/tf2-comp-fixes
       # Dhooks2 wget link needs to be updated every time DHooks2 receives an update as their download URL(detour*-sm110) changes on each release
+      # Removed updating to latest tf2-comp-fixes due to issues with windows servers
+      # wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
       - name: Get latest version of TF2 Comp Fixes and its DHooks dependency
         run: |
-          wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
+          wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.15.0/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
           wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours16/dhooks-2.2.0-detours16-sm110.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
                              
         working-directory: ${{ env.SOURCEMOD_PATH }}/
@@ -161,4 +163,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_branch: updater-beta
-          publish_dir: build/
+          publish_dir: build/

.github/workflows/release.yml

@@ -43,9 +43,11 @@ jobs:
 
       # TF2 Comp Fixes: https://github.com/ldesgoui/tf2-comp-fixes
       # Dhooks2 wget link needs to be updated every time DHooks2 receives an update as their download URL(detour*-sm110) changes on each release
+      # Removed updating to latest tf2-comp-fixes due to issues with windows servers
+      # wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
       - name: Get latest version of TF2 Comp Fixes and its DHooks dependency
         run: |
-          wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
+          wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/download/v1.15.0/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
           wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/download/v2.2.0-detours16/dhooks-2.2.0-detours16-sm110.zip && unzip -o tmp.zip -d ../../  && rm tmp.zip
                              
         working-directory: ${{ env.SOURCEMOD_PATH }}/

VERSION.md

@@ -2,4 +2,4 @@ In order to automatically update the whitelists/plugins easily without the need
 
 NOTE: This file does not need to be touched if you do other commits as the whitelists will get updated anyways on all commits and eventually merges to master. Only do a version bump if you do not have any other changes to make to the file to force whitelist/plugin updates.
 
-v90?
+v98

addons/sourcemod/scripting/rglqol.sp

@@ -187,7 +187,8 @@ public SetDefaultWhitelist()
     // check to see if tftrue exists, and if it fails to load after a tf2 update use default mp_tournament_whitelist
     if(FileExists("addons/TFTrue.vdf")) 
     {
-        if (FindConVar("tftrue_version") != INVALID_HANDLE) 
+        // if we don't have a handle for tftrue version it's not loaded
+        if (FindConVar("tftrue_version") == null) 
         {
             LogMessage("[RGLQoL] TFTrue exists but is not loaded, may be broken. Using default mp_tournament_whitelist value instead.");
 

cfg/rgl_base.cfg

@@ -10,15 +10,24 @@ sm_updater_check                                 // autoupdates to prevent tampe
 
 // TF2 Comp Fixes
 sm_deterministic_fall_damage                1
+sm_empty_active_ubercharges_when_dropped    0
 sm_fix_ghost_crossbow_bolts                 1
+sm_fix_post_pause_state                     0
+sm_fix_reflect_self_damage                  0
 sm_fix_slope_bug                            1
 sm_fix_sticky_delay                         1
-sm_gunboats_always_apply                    0
-sm_projectiles_ignore_teammates             0
+sm_inhibit_extendfreeze                     1
+sm_override_pipe_size                       0
+sm_projectiles_collide_with_cylinders	      0
+sm_projectiles_ignore_teammates	            0
 sm_remove_halloween_souls                   1
-sm_remove_medic_attach_speed                0
 sm_remove_pipe_spin                         0
 sm_rest_in_peace_rick_may                   128
+sm_grounded_rj_resistance                   0
+sm_gunboats_always_apply                    0
+sm_prevent_respawning                       0
+sm_remove_medic_attach_speed                0
+sm_solid_buildings                          0
 sm_winger_jump_bonus_when_fully_deployed    0
 
 // Removes holiday events