Check to make sure neither entity has been freed when calling touch functions, fixes...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / ipban.qc

diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc
index a7786f6b660eac467b1d7ea689dfb0f4dac98f92..a949da10b3ca150a1911c44622bc6c11396a2614 100644 (file)
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@ -1,12 +1,11 @@
 #include "ipban.qh"
 
-#include <server/defs.qh>
-#include <server/miscfunctions.qh>
-#include "autocvars.qh"
-#include "command/banning.qh"
-#include "defs.qh"
-#include "../common/constants.qh"
-#include "../common/util.qh"
+#include <common/constants.qh>
+#include <common/stats.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <server/command/banning.qh>
+#include <server/main.qh>
 
 /*
  * Protocol of online ban list:
@@ -552,7 +551,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync)
                        }
                }
        }
-       // if we replace someone, will we be banned longer than him (so long-term
+       // if we replace someone, will we be banned longer than them (so long-term
        // bans never get overridden by short-term bans)
        if(i < ban_count)
        if(ban_expire[i] > time + bantime)