Archiviert
1
0
Commit graph

1110 Commits

Autor SHA1 Nachricht Datum
Chaoscaot
0ec38aed02 Fix Messages
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 22:09:21 +01:00
Chaoscaot
862176b0f0 Add Only Active Punishments on Whois
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 19:55:06 +01:00
Chaoscaot
533d33d2aa Merge branch 'master' into bot_upload 2021-12-30 12:51:48 +01:00
Chaoscaot
f547667937 Doing PR Stuff
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-30 11:53:54 +01:00
zOnlyKroks
87db052478 Yoyo glücklich machen 2021-12-29 10:42:38 +01:00
zOnlyKroks
1cfa6359e8 Formatting 2021-12-29 10:38:05 +01:00
zOnlyKroks
01ff551213 Merge branch 'master' into Playtime_Command 2021-12-29 10:37:19 +01:00
zOnlyKroks
858e657974 Format 2021-12-29 10:30:15 +01:00
zOnlyKroks
071e88966e Format 2021-12-29 10:23:58 +01:00
zOnlyKroks
94fe119330 Format 2021-12-29 10:19:53 +01:00
zOnlyKroks
1815c986d5 Format 2021-12-29 10:17:25 +01:00
zOnlyKroks
f1c85771a7 Format 2021-12-29 10:17:09 +01:00
zOnlyKroks
591395c64c Format 2021-12-29 10:16:58 +01:00
zOnlyKroks
981be71d4e Format 2021-12-29 10:15:24 +01:00
zOnlyKroks
73321e4b7e Format 2021-12-29 10:11:39 +01:00
zOnlyKroks
803b591ff4 Format 2021-12-29 09:29:55 +01:00
edbeabcac9 Merge pull request 'Omni Replay' (#236) from replaying into master
Reviewed-on: SteamWar/BungeeCore#236
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-28 19:45:04 +01:00
35c16b1fae Try with resources
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-28 16:16:16 +01:00
c928c480f2 Merge branch 'master' into replaying 2021-12-28 11:33:47 +01:00
7ad4d73674 Nice Replay display
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-27 19:36:51 +01:00
581acd4891 Merge pull request 'Old Bug, New Fix' (#287) from old_bugs into master
Reviewed-on: SteamWar/BungeeCore#287
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-27 18:54:17 +01:00
Chaoscaot
7730ea29fe Old Bug, New Fix
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-27 18:14:45 +01:00
308a313b32 Merge pull request 'Update TablistManager' (#286) from UpdatePing into master
Reviewed-on: SteamWar/BungeeCore#286
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 16:28:06 +01:00
yoyosource
27b8fa969f Update TablistManager 2021-12-27 14:15:21 +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
Chaoscaot
98d06544ef Doing PR Stuff
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-25 22:44:29 +01:00
zOnlyKroks
6b0fb7ca6f ) 2021-12-24 17:37:53 +01:00
zOnlyKroks
86e9c17d73 Yoyo ist nen formatting freak 2021-12-24 17:36:22 +01:00
zOnlyKroks
896ea6b6d4 Formatting 2021-12-24 17:35:17 +01:00
zOnlyKroks
28f96c1708 Formatting 2021-12-24 17:29:41 +01:00
zOnlyKroks
9b487e929c Fixes 2021-12-24 17:16:01 +01:00
6c6ecfccb3 Merge branch 'master' into Playtime_Command 2021-12-24 11:17:29 +01:00
zOnlyKroks
d72c8e612f Command implementation 2021-12-24 11:16:29 +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
Chaoscaot
da9b5d82ab Merge branch 'master' into bot_upload 2021-12-16 17:24:26 +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