Archiviert
1
0
Commit graph

1921 Commits

Autor SHA1 Nachricht Datum
yoyosource
8a417e32c1 Fix some stuff for later use 2022-06-14 18:19:25 +02:00
yoyosource
22ef3cd13d Fix some stuff for later use 2022-06-14 18:16:44 +02:00
2cd808b8aa Merge branch 'master' into deadline 2022-06-14 18:12:21 +02:00
60f4db4702 Merge pull request 'Add SWCommand and corresponding api' (#370) from CommandAPI into master
Reviewed-on: SteamWar/BungeeCore#370
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-14 17:23:29 +02:00
7b5359b558 Merge branch 'master' into deadline 2022-06-14 16:24:49 +02:00
yoyosource
a0ae828fbd Add SWCommand and corresponding api 2022-06-14 16:18:45 +02:00
0f58e89d24 Merge pull request 'Add ServerMetaInfo' (#369) from AddMetaInfo into master
Reviewed-on: SteamWar/BungeeCore#369
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-14 16:13:58 +02:00
yoyosource
bf4f7c6adf Add ServerMetaInfo 2022-06-14 15:47:11 +02:00
7aadaa2df3 Fix communication
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-14 09:32:43 +02:00
b285585608 Fix packet direction
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-14 09:09:59 +02:00
03462b0900 Merge branch 'master' into deadline 2022-06-14 09:08:38 +02:00
yoyosource
584b8197aa Merge branch 'master' into deadline 2022-06-14 09:08:12 +02:00
07cb11e12b Fix SWInventory
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-14 09:08:05 +02:00
571fa8c7d1 Fix concurrency, fix cast
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-14 08:56:09 +02:00
98079a2331 Merge pull request 'Bungee Network' (#362) from network into master
Reviewed-on: SteamWar/BungeeCore#362
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-14 08:50:04 +02:00
533f0a4269 Fix copyright
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-14 08:37:32 +02:00
41d27c567d Merge branch 'master' into network
# Conflicts:
#	src/de/steamwar/bungeecore/listeners/TablistManager.java
2022-06-14 08:28:10 +02:00
d05af2258b Fix translation
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-13 22:38:09 +02:00
9df8493b77 Merge pull request 'Cannot spoof chat my ass' (#368) from spoofChat into master
Reviewed-on: SteamWar/BungeeCore#368
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2022-06-13 22:13:57 +02:00
0446af29aa Cannot spoof chat my ass
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-13 22:10:10 +02:00
c2544e44fc WIP new tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-13 21:04:24 +02:00
yoyosource
3a97baa267 Add debug messages for fabric checks 2022-06-12 18:22:33 +02:00
yoyosource
8267966409 Merge remote-tracking branch 'origin/master' 2022-06-12 18:17:51 +02:00
yoyosource
3d57f9ca80 Add debug messages for fabric checks 2022-06-12 18:17:44 +02:00
8e4729aab0 Merge pull request '1.19 Build server' (#366) from bau19 into master
Reviewed-on: SteamWar/BungeeCore#366
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-06-11 20:41:18 +02:00
Chaoscaot
e49546d3d8 Fix Remote Plugin Messages 2022-06-11 09:44:39 +02:00
Chaoscaot
a97a6a78e2 Fix Remote Plugin Messages 2022-06-11 08:55:51 +02:00
01ea928652 1.19 Build server
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-10 19:30:15 +02:00
1ef5f9e625 Merge pull request 'ConvertFromWaterfall' (#363) from ConvertFromWaterfall into master
Reviewed-on: SteamWar/BungeeCore#363
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-08 16:54:22 +02:00
c5ae7fd229 Merge branch 'master' into ConvertFromWaterfall 2022-06-08 16:53:01 +02:00
69c325cf17 Merge pull request 'FixBungeeTablistPlus' (#364) from FixBungeeTablistPlus into master
Reviewed-on: SteamWar/BungeeCore#364
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-08 16:19:06 +02:00
2f06ea374e Simplify connection detection
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-08 16:18:04 +02:00
yoyosource
6769fd88e7 Fix TablistManager 2022-06-08 16:06:31 +02:00
yoyosource
f63213c9aa Fix build.gradle 2022-06-08 16:05:17 +02:00
yoyosource
bad4efd520 Convert everything from waterfall to plain bungee 2022-06-08 13:28:56 +02:00
yoyosource
9439887785 Fix TablistManager for newer BTLP plugin 2022-06-08 13:18:24 +02:00
yoyosource
27750d4e71 Merge remote-tracking branch 'origin/master' 2022-06-07 22:38:29 +02:00
yoyosource
1a91e561fa Disable SWTSI for now 2022-06-07 22:38:08 +02:00
Chaoscaot
446b4ad519 Bungee Network 2022-06-07 20:53:09 +02:00
59672e8d02 Merge pull request 'Using sql connections in round robbin mode instead of the same (possibly)' (#361) from sql into master
Reviewed-on: SteamWar/BungeeCore#361
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-06-07 14:14:21 +02:00
c74b2b2c84 Fix settings changed npe
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-07 14:13:51 +02:00
9f7f5eef36 Test fix ban timeout
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-04 22:49:07 +02:00
6d0a1f6bfd Fix geyser floodgate null
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-06-04 16:23:13 +02:00
dea8e0b731 Merge branch 'master' into sql 2022-06-03 22:25:37 +02:00
yoyosource
d4e2e80dd5 Hotfix WhoisCommand 2022-06-03 13:26:03 +02:00
yoyosource
edfbfb614d Hotfix WhoisCommand 2022-06-03 13:24:47 +02:00
yoyosource
bb68a4a690 Using sql connections in round robbin mode instead of the same (possibly) 2022-06-02 17:08:29 +02:00
yoyosource
e61a98c2a3 Update some stuff 2022-06-01 23:19:30 +02:00
yoyosource
abc775009e Merge branch 'master' into deadline 2022-06-01 23:15:23 +02:00
yoyosource
163e40f2dd Fix ErrorLogger 2022-05-30 15:35:51 +02:00