Archiviert
1
0
Commit graph

1765 Commits

Autor SHA1 Nachricht Datum
2352410f2b Fix tablist issues
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-09 22:51:08 +02:00
0c5c9e7d42 Reduce arena RAM
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
Reviewed-on: SteamWar/BungeeCore#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
Reviewed-on: SteamWar/BungeeCore#255
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-09 15:45:00 +02:00
Chaoscaot
1cc289c11e Fix Bot
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
2021-10-09 12:57:53 +02:00
53138d89f8 Merge branch 'master' into Punishment++ 2021-10-08 11:31:38 +02:00
9bf5146114 Hotfix tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-08 07:27:40 +02:00
89f1a17c91 Hotfix tablist
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
Reviewed-on: SteamWar/BungeeCore#234
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-08 07:11:28 +02:00
e9ee427c26 Merge branch 'master' into fightInfoPacket 2021-10-08 07:10:59 +02:00
yoyosource
fe2c6fc0b5 Update messages 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++ 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++ 2021-10-06 11:16:47 +02:00
dc83c2bda1 Merge pull request 'Fix discord bot shutdown' (#254) from fixShutdown into master
Reviewed-on: SteamWar/BungeeCore#254
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-05 12:13:46 +02:00
yoyosource
4f7ccf2028 Fix stuff 2021-10-02 21:24:32 +02:00
3f417d8ecb Cyclic port running to reduce failing server starts
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-02 19:07:50 +02:00
aebb37e10e Fix discord bot shutdown
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-02 07:48:21 +02:00
yoyosource
b24c3d0d6b Merge branch 'master' into Punishment++
# 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
Reviewed-on: SteamWar/BungeeCore#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 2021-10-01 10:55:29 +02:00
ef8928d3bd Better encapsulation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 10:41:58 +02:00
c3c666c305 Encapsulate DiscordBot errors
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 10:38:48 +02:00
f9b42ad0c1 Prevent username triggering
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-30 16:21:24 +02:00
yoyosource
ecaba65f79 Update Punishment, messages not final 2021-09-30 13:47:21 +02:00
33924752c8 Fix unregistering
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-30 12:30:11 +02:00
5bcc87aa1e Fix autoreconnect
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
Reviewed-on: SteamWar/BungeeCore#242
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-09-30 12:20:26 +02:00
yoyosource
9da2228806 Merge branch 'master' into Punishment++ 2021-09-27 16:57:23 +02:00
yoyosource
064796ec48 Fix Node NumberFormatException 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
Reviewed-on: SteamWar/BungeeCore#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
Reviewed-on: SteamWar/BungeeCore#251
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-09-27 16:52:44 +02:00
yoyosource
c51415443f Fix Node NumberFormatException 2021-09-27 16:46:26 +02:00
yoyosource
0cdcfc12a8 Update DiscordBot integration 2021-09-27 16:42:07 +02:00
1d8966865f Merge branch 'master' into long_discord 2021-09-27 16:28:46 +02:00
b18b4a73d3 Merge branch 'master' into Punishment++ 2021-09-27 15:58:39 +02:00
5b5a1796ef Add steamwarci script
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-27 15:23:20 +02:00
yoyosource
3d49d907a4 Fix messages 2021-09-27 09:37:50 +02:00
yoyosource
bb9627b74c Add punishment implementations 2021-09-27 09:29:51 +02:00
yoyosource
0b6b2c6b6b Update Punishments and commands for each punishment 2021-09-27 08:47:56 +02:00
yoyosource
a886936cf3 Add grouping to messages 2021-09-26 23:38:43 +02:00
yoyosource
b5a9ecc999 Remove unintended imports 2021-09-26 23:36:41 +02:00
yoyosource
3cfd3f5beb Update Punishment system
Simplify Punishment code overhead
2021-09-26 23:34:15 +02:00
f8d6b73c0f Fix deadlock #3 :/
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-26 21:46:35 +02:00
49f7dc9911 Fix deadlock #2 :/
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-21 19:05:28 +02:00
2b2fc2b00e Fix deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-19 16:41:42 +02:00