Skip to content

Commit b1fcd5b

Browse files
committed
Merge branch 'development'
2 parents 8e9f5a4 + 098c7d6 commit b1fcd5b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
You've found a comprehensive solution that helps you administrate your DCS World servers. It has a Discord integration
88
([now optional](#dcsserverbot-installation-non-discord)!) with slash-commands, built in per-server and per-user
99
statistics, optional cloud-based statistics, [Coalitions](./COALITIONS.md)-support, a whole
10-
[Tournament-System](./plugins/tournament/README.md) and much more!<br>
10+
[Tournament-System](./plugins/tournament/README.md), a third-party [web-frontend](https://github.com/Penfold-88/DCS-Statistics-Dashboard) for
11+
statistics and much more!
12+
<p>
1113
With its plugin system and reporting framework, DCSServerBot can be enhanced very easily to support whatever might come
1214
into your mind. DCSServerBot is a solution for DCS server admins built by a DCS server admin.
13-
15+
<p>
1416
This documentation shows you the main features, how to install and configure the bot and some more sophisticated
1517
stuff at the bottom, if you for instance run multiple servers maybe even over multiple locations.
16-
18+
<p>
1719
Now let's see what DCSServerBot can do for you (installation-instructions [below](#installation))!
1820

1921
---

core/plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ def filter_element(element: dict) -> dict:
476476
else:
477477
return element
478478

479-
default = deepcopy(filter_element(self.locals.get(DEFAULT_TAG, {})))
480-
specific = deepcopy(filter_element(self.locals.get(server.node.name, self.locals).get(server.instance.name, {})))
479+
default = deepcopy(filter_element(self.locals.get(DEFAULT_TAG) or {}))
480+
specific = deepcopy(filter_element(self.locals.get(server.node.name, self.locals).get(server.instance.name) or {}))
481481
return default, specific
482482

483483
def get_config(self, server: Optional[Server] = None, *, plugin_name: Optional[str] = None,

0 commit comments

Comments
 (0)