|
|
87641dbfc2
|
Prevent ConcurrentModException
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:16:01 +02:00 |
|
|
|
62681be8d4
|
Comma seperated team info
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-25 09:13:48 +02:00 |
|
|
|
b4d22eaf28
|
Merge pull request 'Ciao on OutOfMemory!' (#265) from stability into master
SteamWarCI Build successful
Reviewed-on: #265
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-24 19:38:15 +02:00 |
|
|
|
9ba20d7426
|
Ciao on OutOfMemory!
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-24 16:26:27 +02:00 |
|
|
|
1c905967c1
|
Merge pull request 'Improved stability' (#264) from stability into master
SteamWarCI Build successful
Reviewed-on: #264
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-22 20:16:44 +02:00 |
|
|
|
317df7b7a8
|
Improved stability
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-22 20:13:31 +02:00 |
|
|
|
eb8b5e3bc6
|
Fix tablist size
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 18:07:28 +02:00 |
|
|
|
1c3208934d
|
Fix FAWE 1.9-1.12
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 13:42:47 +02:00 |
|
|
|
d37a68f373
|
Fix missing log4jconfiguration file
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-12 13:11:23 +02:00 |
|
|
|
bffbacc289
|
Merge remote-tracking branch 'origin/Punishment++'
SteamWarCI Build successful
# Conflicts:
# src/de/steamwar/bungeecore/commands/DevCommand.java
# src/de/steamwar/bungeecore/sql/SteamwarUser.java
|
2021-10-12 11:54:41 +02:00 |
|
|
|
d7b6abb1ca
|
Merge pull request 'Use OpenJ9' (#260) from openj9 into master
SteamWarCI Build successful
Reviewed-on: #260
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-12 11:45:12 +02:00 |
|
|
|
7debcf1782
|
Merge pull request 'Fix tablist issues' (#261) from tablist into master
SteamWarCI Build successful
Reviewed-on: #261
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-12 11:44:42 +02:00 |
|
|
|
f798c1bf8c
|
Merge pull request 'Fix whois NPE on never connected user' (#262) from whoisFix into master
SteamWarCI Build successful
Reviewed-on: #262
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-10 11:12:07 +02:00 |
|
|
|
adeb5de034
|
Fix whois NPE on never connected user
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-10 08:20:30 +02:00 |
|
|
|
2352410f2b
|
Fix tablist issues
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 22:51:08 +02:00 |
|
|
|
0c5c9e7d42
|
Reduce arena RAM
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 21:53:50 +02:00 |
|
|
|
801d9da2e1
|
OpenJ9
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 16:06:31 +02:00 |
|
|
|
6210cdf16d
|
WIP tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-09 16:06:14 +02:00 |
|
|
|
e66dd48b89
|
Merge pull request 'Fix Bot' (#258) from fix-bot into master
SteamWarCI Build successful
Reviewed-on: #258
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-09 15:57:37 +02:00 |
|
|
|
3fbfcbe288
|
Merge pull request 'Cyclic port running to reduce failing server starts' (#255) from cyclicPorts into master
SteamWarCI Build successful
Reviewed-on: #255
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-09 15:45:00 +02:00 |
|
Chaoscaot
|
1cc289c11e
|
Fix Bot
SteamWarCI Build successful
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
|
2021-10-09 12:57:53 +02:00 |
|
|
|
53138d89f8
|
Merge branch 'master' into Punishment++
SteamWarCI Build successful
|
2021-10-08 11:31:38 +02:00 |
|
|
|
9bf5146114
|
Hotfix tablist
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-08 07:27:40 +02:00 |
|
|
|
89f1a17c91
|
Hotfix tablist
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-08 07:25:06 +02:00 |
|
|
|
bf2a4822ef
|
Merge pull request 'Use new FightInfo + Tablist refactoring' (#234) from fightInfoPacket into master
SteamWarCI Build successful
Reviewed-on: #234
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-08 07:11:28 +02:00 |
|
|
|
e9ee427c26
|
Merge branch 'master' into fightInfoPacket
SteamWarCI Build successful
|
2021-10-08 07:10:59 +02:00 |
|
yoyosource
|
fe2c6fc0b5
|
Update messages
SteamWarCI Build successful
|
2021-10-07 10:55:59 +02:00 |
|
yoyosource
|
2ef2f81496
|
Update imports
|
2021-10-07 10:28:53 +02:00 |
|
yoyosource
|
976bc4ed87
|
Merge remote-tracking branch 'origin/Punishment++' into Punishment++
SteamWarCI Build successful
|
2021-10-06 11:28:21 +02:00 |
|
yoyosource
|
0f5087c76c
|
Add Punishment.PunishmentType.NoSchemSubmitting
|
2021-10-06 11:28:11 +02:00 |
|
|
|
2f0643779f
|
Merge branch 'master' into Punishment++
SteamWarCI Build successful
|
2021-10-06 11:16:47 +02:00 |
|
|
|
dc83c2bda1
|
Merge pull request 'Fix discord bot shutdown' (#254) from fixShutdown into master
SteamWarCI Build successful
Reviewed-on: #254
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-05 12:13:46 +02:00 |
|
yoyosource
|
4f7ccf2028
|
Fix stuff
SteamWarCI Build successful
|
2021-10-02 21:24:32 +02:00 |
|
|
|
3f417d8ecb
|
Cyclic port running to reduce failing server starts
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-02 19:07:50 +02:00 |
|
|
|
aebb37e10e
|
Fix discord bot shutdown
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-02 07:48:21 +02:00 |
|
yoyosource
|
b24c3d0d6b
|
Merge branch 'master' into Punishment++
SteamWarCI Build successful
# Conflicts:
# src/de/steamwar/bungeecore/sql/SteamwarUser.java
|
2021-10-01 12:12:01 +02:00 |
|
|
|
f270985f8f
|
Merge pull request 'Making listener stuff volatile to fix NPE's with multiple threads accessing them' (#253) from BetterInit into master
SteamWarCI Build successful
Reviewed-on: #253
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-10-01 11:54:06 +02:00 |
|
yoyosource
|
a3d768b1f1
|
Making listener stuff volatile to fix NPE's with multiple threads accessing them
SteamWarCI Build successful
|
2021-10-01 10:55:29 +02:00 |
|
|
|
ef8928d3bd
|
Better encapsulation
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 10:41:58 +02:00 |
|
|
|
c3c666c305
|
Encapsulate DiscordBot errors
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 10:38:48 +02:00 |
|
|
|
f9b42ad0c1
|
Prevent username triggering
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 16:21:24 +02:00 |
|
yoyosource
|
ecaba65f79
|
Update Punishment, messages not final
SteamWarCI Build successful
|
2021-09-30 13:47:21 +02:00 |
|
|
|
33924752c8
|
Fix unregistering
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 12:30:11 +02:00 |
|
|
|
5bcc87aa1e
|
Fix autoreconnect
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 12:26:54 +02:00 |
|
|
|
abd5aab9bf
|
Merge pull request 'Long DiscordId' (#242) from long_discord into master
SteamWarCI Build successful
Reviewed-on: #242
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-30 12:20:26 +02:00 |
|
yoyosource
|
9da2228806
|
Merge branch 'master' into Punishment++
SteamWarCI Build successful
|
2021-09-27 16:57:23 +02:00 |
|
yoyosource
|
064796ec48
|
Fix Node NumberFormatException
SteamWarCI Build successful
|
2021-09-27 16:55:54 +02:00 |
|
yoyosource
|
5918a2530a
|
Fix Node NumberFormatException
|
2021-09-27 16:55:00 +02:00 |
|
|
|
1f02790bc7
|
Merge pull request 'Update DiscordBot integration' (#250) from DiscordBot into master
SteamWarCI Build successful
Reviewed-on: #250
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-27 16:53:11 +02:00 |
|
|
|
5f2465ddfc
|
Merge pull request 'Fix Node NumberFormatException' (#251) from Node into master
SteamWarCI Build successful
Reviewed-on: #251
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2021-09-27 16:52:44 +02:00 |
|
