SteamWar/BungeeCore
Archiviert
13
2
Commit graph

1994 Commits

Autor SHA1 Nachricht Datum
edbeabcac9 Merge pull request 'Omni Replay' (#236) from replaying into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #236
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-28 19:45:04 +01:00
35c16b1fae Try with resources
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-28 16:16:16 +01:00
c928c480f2 Merge branch 'master' into replaying
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-28 11:33:47 +01:00
7ad4d73674 Nice Replay display
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #287
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-27 18:54:17 +01:00
Chaoscaot
7730ea29fe Old Bug, New Fix
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #286
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-27 16:28:06 +01:00
yoyosource
27b8fa969f Update TablistManager
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-27 14:15:21 +01:00
d6e01e6bae Merge branch 'master' into replaying
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
# 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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-25 22:44:29 +01:00
zOnlyKroks
6b0fb7ca6f )
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-24 17:37:53 +01:00
zOnlyKroks
86e9c17d73 Yoyo ist nen formatting freak
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-24 17:36:22 +01:00
zOnlyKroks
896ea6b6d4 Formatting
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-24 17:35:17 +01:00
zOnlyKroks
28f96c1708 Formatting
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-24 17:29:41 +01:00
zOnlyKroks
9b487e929c Fixes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-24 17:16:01 +01:00
6c6ecfccb3 Merge branch 'master' into Playtime_Command
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2021-12-24 11:17:29 +01:00
zOnlyKroks
d72c8e612f Command implementation
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-24 11:16:29 +01:00
c6900a2521 Merge branch 'FixTablist'
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-23 17:38:33 +01:00
5002b07748 Fix stack overflow
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #283
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-22 17:09:58 +01:00
39c7254963 Simplify code
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-22 17:09:16 +01:00
yoyosource
6e6cf76479 Update TablistManager
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-22 11:38:00 +01:00
yoyosource
02883f2bea Update TablistManager
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-22 11:29:43 +01:00
adbf041135 Merge branch 'master' into FixTablist
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-22 10:17:48 +01:00
yoyosource
0cc93f433e Fix TablistManager
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-22 10:17:28 +01:00
b6be4a68ba Merge pull request 'Prevent arena start dos' (#280) from dosPrevention into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #280
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-21 21:06:55 +01:00
864c51c3d9 Prevent arena start dos
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #278
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-19 08:25:28 +01:00
yoyosource
1087cdb74c Add better Tablist Slim behaviour
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-18 14:20:35 +01:00
75b823f780 Fix renaming
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-17 06:52:08 +01:00
Chaoscaot
da9b5d82ab Merge branch 'master' into bot_upload
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-16 17:24:26 +01:00
db6f134b4c Merge pull request 'Fix Bans on lndi' (#276) from fix_multiban into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #276
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-12-16 17:19:32 +01:00
Chaoscaot
fe80ede6e0 Fix of 20+ Bans on lndi
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #273
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-16 15:45:33 +01:00
Chaoscaot
8a43110100 Add Discord Bot Upload
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-12 20:40:25 +01:00
276cdf1762 Use default java instead of hardcoded java
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-11 16:54:06 +01:00
c98e2c381d Autopermabann on jndi:ldap
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-10 09:19:01 +01:00
defc261e5e Hotfix: No paper baus
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #274
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-05 12:55:31 +01:00
Chaoscaot
d3d48d9514 Fix Poll Commands
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-12-05 12:54:39 +01:00
87ccd1a6d8 Fix possible world names for paper
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #272
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-02 21:37:32 +01:00
2dd8cf3f8b Fix check without rank
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #269
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-02 14:26:12 +01:00
9f7eca9689 Display sorted
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-12-02 09:41:53 +01:00
9fc112d882 Merge branch 'master' into configRefactoring
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-12-02 08:46:58 +01:00
6bb90af3bc Fix loading of non startable gamemodes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #271
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-12-02 08:37:44 +01:00