|
7ad4d73674
|
Nice Replay display
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-27 19:36:51 +01:00 |
|
|
d6e01e6bae
|
Merge branch 'master' into replaying
# Conflicts:
# src/de/steamwar/bungeecore/BungeeCore.java
# src/de/steamwar/bungeecore/SubserverSystem.java
# src/de/steamwar/bungeecore/sql/Statement.java
|
2021-12-27 13:14:14 +01:00 |
|
|
c6900a2521
|
Merge branch 'FixTablist'
|
2021-12-23 17:38:33 +01:00 |
|
|
5002b07748
|
Fix stack overflow
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-23 17:38:08 +01:00 |
|
|
c74873b75c
|
Merge pull request 'Fix TablistManager' (#283) from FixTablist into master
Reviewed-on: SteamWar/BungeeCore#283
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-12-22 17:09:58 +01:00 |
|
|
39c7254963
|
Simplify code
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-22 17:09:16 +01:00 |
|
yoyosource
|
6e6cf76479
|
Update TablistManager
|
2021-12-22 11:38:00 +01:00 |
|
yoyosource
|
02883f2bea
|
Update TablistManager
|
2021-12-22 11:29:43 +01:00 |
|
|
adbf041135
|
Merge branch 'master' into FixTablist
|
2021-12-22 10:17:48 +01:00 |
|
yoyosource
|
0cc93f433e
|
Fix TablistManager
|
2021-12-22 10:17:28 +01:00 |
|
|
b6be4a68ba
|
Merge pull request 'Prevent arena start dos' (#280) from dosPrevention into master
Reviewed-on: SteamWar/BungeeCore#280
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-21 21:06:55 +01:00 |
|
|
864c51c3d9
|
Prevent arena start dos
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-19 16:50:29 +01:00 |
|
|
a132aafcbc
|
Merge pull request 'Add better Tablist Slim behaviour' (#278) from BetterTabListSlimBehaviour into master
Reviewed-on: SteamWar/BungeeCore#278
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-12-19 08:25:28 +01:00 |
|
yoyosource
|
1087cdb74c
|
Add better Tablist Slim behaviour
|
2021-12-18 14:20:35 +01:00 |
|
|
75b823f780
|
Fix renaming
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-17 06:52:08 +01:00 |
|
|
db6f134b4c
|
Merge pull request 'Fix Bans on lndi' (#276) from fix_multiban into master
Reviewed-on: SteamWar/BungeeCore#276
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-12-16 17:19:32 +01:00 |
|
Chaoscaot
|
fe80ede6e0
|
Fix of 20+ Bans on lndi
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 17:10:27 +01:00 |
|
|
71befae83b
|
Merge pull request 'Use default java instead of hardcoded java' (#275) from defaultJava into master
Reviewed-on: SteamWar/BungeeCore#275
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 15:45:43 +01:00 |
|
|
191ccc6ed9
|
Merge pull request 'Fix possible world names for paper' (#273) from fixWorldNames into master
Reviewed-on: SteamWar/BungeeCore#273
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-16 15:45:33 +01:00 |
|
|
276cdf1762
|
Use default java instead of hardcoded java
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-11 16:54:06 +01:00 |
|
|
c98e2c381d
|
Autopermabann on jndi:ldap
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-10 09:19:01 +01:00 |
|
|
defc261e5e
|
Hotfix: No paper baus
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-10 09:08:47 +01:00 |
|
|
4a264734f6
|
Merge pull request 'Fix Poll Commands' (#274) from fix_poll_command into master
Reviewed-on: SteamWar/BungeeCore#274
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-05 12:55:31 +01:00 |
|
Chaoscaot
|
d3d48d9514
|
Fix Poll Commands
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-12-05 12:54:39 +01:00 |
|
|
87ccd1a6d8
|
Fix possible world names for paper
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-04 07:57:06 +01:00 |
|
|
3be85af4bb
|
Merge pull request 'FAWE 1.12 should now be Java 16/17 compatible' (#272) from omniJ9 into master
Reviewed-on: SteamWar/BungeeCore#272
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-02 21:37:32 +01:00 |
|
|
2dd8cf3f8b
|
Fix check without rank
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 17:46:39 +01:00 |
|
|
78874e0800
|
FAWE 1.12 should now be Java 16/17 compatible
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 17:08:00 +01:00 |
|
|
f975c4c867
|
Merge pull request 'Using new config' (#269) from configRefactoring into master
Reviewed-on: SteamWar/BungeeCore#269
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-02 14:26:12 +01:00 |
|
|
9f7eca9689
|
Display sorted
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 09:41:53 +01:00 |
|
|
9fc112d882
|
Merge branch 'master' into configRefactoring
|
2021-12-02 08:46:58 +01:00 |
|
|
6bb90af3bc
|
Fix loading of non startable gamemodes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-12-02 08:45:01 +01:00 |
|
|
3ff348fbc5
|
Merge pull request 'GDPR query processor' (#271) from dsgvo-query into master
Reviewed-on: SteamWar/BungeeCore#271
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-12-02 08:37:44 +01:00 |
|
|
582924fb7d
|
GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-25 14:47:37 +01:00 |
|
|
a6ea418047
|
WIP GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-23 19:59:50 +01:00 |
|
|
866d57f8dc
|
WIP GDPR query processor
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-23 19:27:03 +01:00 |
|
|
0339067295
|
Merge branch 'master' into configRefactoring
|
2021-11-23 11:26:43 +01:00 |
|
|
f192deaeea
|
Merge pull request 'Fix CheckCommand' (#270) from check_fix into master
Reviewed-on: SteamWar/BungeeCore#270
|
2021-11-20 21:06:14 +01:00 |
|
Chaoscaot
|
d31f3a31d1
|
Fix CheckCommand
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-20 21:05:34 +01:00 |
|
|
d6961419e6
|
Merge pull request 'Changing to Schemnodes' (#190) from schem_nodes into master
Reviewed-on: SteamWar/BungeeCore#190
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-11-20 13:17:31 +01:00 |
|
Chaoscaot
|
ea8e5831c4
|
Update from Spigot
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-20 11:29:04 +01:00 |
|
Chaoscaot
|
2e5f0de710
|
Everthings Tested!
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-11-14 12:00:29 +01:00 |
|
|
e32a223476
|
Using new config
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-12 17:14:56 +01:00 |
|
Chaoscaot
|
3ac81810c4
|
Fixing Merge Conflicts & Updating!
|
2021-11-12 15:52:15 +01:00 |
|
Chaoscaot
|
a9172929be
|
Merge remote-tracking branch 'origin/master' into schem_nodes
# Conflicts:
# src/de/steamwar/bungeecore/commands/CheckCommand.java
# src/de/steamwar/bungeecore/sql/CheckedSchematic.java
# src/de/steamwar/bungeecore/sql/Schematic.java
# src/de/steamwar/bungeecore/sql/SchematicMember.java
|
2021-11-12 14:35:58 +01:00 |
|
|
1588e74116
|
Merge pull request 'Reduce OOM-Crashes' (#267) from lessBauCrashes into master
Reviewed-on: SteamWar/BungeeCore#267
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-26 20:16:28 +02:00 |
|
|
75d5e00c68
|
Reduce OOM-Crashes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-26 17:08:48 +02:00 |
|
|
d6aefa9ec7
|
Merge pull request 'Comma seperated team info' (#266) from commaTeamInfo into master
Reviewed-on: SteamWar/BungeeCore#266
|
2021-10-25 09:17:36 +02:00 |
|
|
87641dbfc2
|
Prevent ConcurrentModException
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:16:01 +02:00 |
|
|
62681be8d4
|
Comma seperated team info
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:13:48 +02:00 |
|