From 94cd2bfeac073bf0ff0c384e4921c90f281747b0 Mon Sep 17 00:00:00 2001 From: lhofhansl Date: Sun, 8 Jul 2018 13:30:55 -0700 Subject: Revert 6587 - Optimize entity-entity collision (#7539) --- util/travis/clang-format-whitelist.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util/travis') diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index e0da7173f..8f3b0ee6c 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -311,7 +311,8 @@ src/script/scripting_server.cpp src/script/scripting_server.h src/serialization.cpp src/serialization.h -src/server/serveractiveobjectmap.cpp +src/serveractiveobjectmap.cpp +src/serveractiveobjectmap.h src/server.cpp src/serverenvironment.cpp src/serverenvironment.h -- cgit v1.2.3