SteamWar/BungeeCore
SteamWar/BungeeCore
Archiviert
13
2
Fork 1
Code Issues 14 Pull-Requests 4 Releases Wiki Aktivität
902 Commits 13 Branches 0 Tags 15 MiB
8a43110100
Commit graph

796 Commits

Autor SHA1 Nachricht Datum
Lixfel
3f417d8ecb Cyclic port running to reduce failing server starts
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-02 19:07:50 +02:00
Lixfel
aebb37e10e Fix discord bot shutdown
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-02 07:48:21 +02:00
yoyosource
b24c3d0d6b Merge branch 'master' into Punishment++
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
# Conflicts:
#	src/de/steamwar/bungeecore/sql/SteamwarUser.java
 2021-10-01 12:12:01 +02:00
yoyosource
a3d768b1f1 Making listener stuff volatile to fix NPE's with multiple threads accessing them
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-10-01 10:55:29 +02:00
Lixfel
ef8928d3bd Better encapsulation
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 10:41:58 +02:00
Lixfel
c3c666c305 Encapsulate DiscordBot errors
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 10:38:48 +02:00
Lixfel
f9b42ad0c1 Prevent username triggering
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 16:21:24 +02:00
yoyosource
ecaba65f79 Update Punishment, messages not final
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-30 13:47:21 +02:00
Lixfel
33924752c8 Fix unregistering
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 12:30:11 +02:00
Lixfel
5bcc87aa1e Fix autoreconnect
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 12:26:54 +02:00
Lixfel
abd5aab9bf Merge pull request 'Long DiscordId' (#242) from long_discord into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #242
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-09-30 12:20:26 +02:00
yoyosource
064796ec48 Fix Node NumberFormatException
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-27 16:55:54 +02:00
yoyosource
5918a2530a Fix Node NumberFormatException
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details
2021-09-27 16:55:00 +02:00
Lixfel
1f02790bc7 Merge pull request 'Update DiscordBot integration' (#250) from DiscordBot into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #250
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-09-27 16:53:11 +02:00
yoyosource
c51415443f Fix Node NumberFormatException
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-27 16:46:26 +02:00
yoyosource
0cdcfc12a8 Update DiscordBot integration
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-27 16:42:07 +02:00
Lixfel
1d8966865f Merge branch 'master' into long_discord
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-27 16:28:46 +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
Lixfel
f8d6b73c0f Fix deadlock #3 :/ 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-26 21:46:35 +02:00
Lixfel
49f7dc9911 Fix deadlock #2 :/ 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-21 19:05:28 +02:00
Lixfel
2b2fc2b00e Fix deadlock 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-19 16:41:42 +02:00
Lixfel
45cc55c4a1 Memory threshold 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-17 08:48:57 +02:00
Lixfel
74df8a82a3 Memory threshold 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-17 08:45:47 +02:00
Lixfel
a8d62d6115 Fix inversion + debugoutput 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-17 07:58:10 +02:00
Lixfel
265fa45371 Prefer local node 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-17 07:56:26 +02:00
Lixfel
563a5f45f6 Merge branch 'master' into nodeSystem 
# Conflicts:
#	src/de/steamwar/bungeecore/BungeeCore.java
 2021-09-17 07:47:22 +02:00
Chaoscaot
8ad5184d25 Merge remote-tracking branch 'origin/long_discord' into long_discord 2021-09-16 22:22:15 +02:00
Chaoscaot
d41bb58fac Fix null Issues 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-16 22:21:36 +02:00
Lixfel
9f985e4199 Merge branch 'master' into long_discord 2021-09-16 17:14:23 +02:00
Lixfel
d73c0ea7ea Auto core count detection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-16 17:12:22 +02:00
Lixfel
85fe4ba264 Object oriented subserver node system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-16 16:45:47 +02:00
Lixfel
eb4aaaf434 New ErrorLogger implementation matching new SpigotCore implementation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-16 13:10:00 +02:00
Lixfel
947333b788 Merge pull request 'Update Heap size of ListCommand' (#243) from ListCommandHeap into master 
Reviewed-on: #243
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-09-11 21:05:30 +02:00
yoyosource
2d89d64288 Hotfix DiscordEventListener 2021-09-10 20:57:19 +02:00
yoyosource
689538f6c5 Hotfix DiscordBot command integration 2021-09-09 21:30:48 +02:00
yoyosource
ac2a952017 Update Heap size of ListCommand 2021-09-09 21:04:56 +02:00
YoyoNow
1a8365e5c1 Merge pull request 'Add Discord Event Teilnahme' (#241) from event_register into master 
Reviewed-on: #241
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-09-08 19:47:57 +02:00
Chaoscaot
613b78688a Add EventManager Update 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-08 19:44:40 +02:00
YoyoNow
be2e1eaeed Merge branch 'master' into betterDiscord 2021-09-08 19:41:24 +02:00
Chaoscaot
96f54cf6df Simplyfy Int 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-08 19:40:59 +02:00
Chaoscaot
6490ce2848 Long DiscordId 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-08 13:51:42 +02:00
Chaoscaot
21dd3e3e0c House Keeping 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-08 00:57:53 +02:00
Chaoscaot
e66990da29 Add Discord Event Teilnahme 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-07 23:55:07 +02:00
Chaoscaot
27293fc051 Add Message Spliting 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-07 16:49:32 +02:00
Lixfel
f479267e11 Merge pull request '-24s startup time.' (#238) from betterDiscord into master 
Reviewed-on: #238
 2021-09-07 15:37:32 +02:00
Chaoscaot
12186e4f78 Fixing 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-07 13:37:13 +02:00
Lixfel
b604222450 Deny launching multiple bauservers 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-05 18:47:04 +02:00
Lixfel
7bd15ec63f Merge branch 'master' into noBauPassthrough 
# Conflicts:
#	src/de/steamwar/bungeecore/listeners/ChatListener.java
 2021-09-05 18:19:48 +02:00
Chaoscaot
a0ac0a0be2 Async (TM) 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-09-04 23:15:08 +02:00
Lixfel
f0e7f52fd6 -21s Start time. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-04 22:18:38 +02:00
Lixfel
05c37c0df0 Hotfix SteamwarUser 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-04 21:15:30 +02:00
Lixfel
49105c4f73 Hotfix Ignoresystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-04 10:51:11 +02:00
Lixfel
5186526d0a Remove JDBC RAM leak 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-03 12:20:24 +02:00
Chaoscaot
cf43600644 Fixing 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-08-27 18:59:54 +02:00
Chaoscaot
bb1a2d327e Merge branch 'master' into schem_nodes 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/CheckCommand.java
 2021-08-27 16:09:56 +02:00
yoyosource
8140ea3ab3 Merge remote-tracking branch 'origin/master' 2021-08-24 14:24:09 +02:00
yoyosource
013330f18d Hotfix DevCommand 2021-08-24 14:23:51 +02:00
YoyoNow
90883d6982 Merge branch 'master' into BetterDiscord 2021-08-24 10:03:35 +02:00
yoyosource
d623f47410 Fixup async Chat problems 2021-08-22 22:05:57 +02:00
Lixfel
47291dff27 Team highlightning 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 19:00:27 +02:00
Lixfel
3409353a83 Use new FightInfo 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-21 18:55:07 +02:00
yoyosource
bab56f895a Add better AlertCommand 2021-08-21 17:43:12 +02:00
yoyosource
4865c2f9a6 Add UnbanCommand 2021-07-30 16:14:05 +02:00
yoyosource
d476fd12bd Add ListCommand 2021-07-30 16:10:48 +02:00
yoyosource
c0ef12829b Fix TeamCommand 
Fix IngameChatListener
 2021-07-30 15:47:12 +02:00
yoyosource
9e4dbcdbb8 Add TeamCommand Online type 2021-07-30 13:50:47 +02:00
yoyosource
ca52aa40df Hotfix SchematicsManager 2021-07-30 13:23:27 +02:00
yoyosource
334547fa78 Hotfix TeamCommand 2021-07-30 13:15:05 +02:00
yoyosource
66c9d206e7 Hotfix TeamCommand 2021-07-30 13:14:38 +02:00
yoyosource
ebfe912627 Hotfix TeamCommand 2021-07-30 13:06:35 +02:00
yoyosource
9d69d13541 Fix TeamCommand 2021-07-30 13:02:26 +02:00
yoyosource
36e303cd44 Fix TeamCommand 2021-07-30 13:00:39 +02:00
yoyosource
8ac8964f24 Fix TeamCommand 2021-07-30 12:59:27 +02:00
yoyosource
8a6b0e048d Add TeamCommand 2021-07-30 12:57:15 +02:00
yoyosource
65d5653e78 Fix IngameChatListener once again 2021-07-30 12:32:36 +02:00
yoyosource
82a67448f3 Merge branch 'discord-bot' 2021-07-30 12:31:18 +02:00
yoyosource
65798840be Add TeamCommand 
Fix IngameChatListener at everyone and at here
 2021-07-30 12:31:04 +02:00
yoyosource
70d79b24dd Hotfix ChatListener for Discord chat 2021-07-30 12:10:50 +02:00
yoyosource
be5f5a033f Hotfix IngameChatListener 2021-07-30 10:55:02 +02:00
yoyosource
de606f7527 Hotfix TablistManager NPE 2021-07-30 10:52:52 +02:00
yoyosource
9993a3bdf8 Fix AnnouncementListener 2021-07-30 10:49:51 +02:00
yoyosource
21894f0b15 Fix DiscordTicketListener Button text 2021-07-30 09:52:43 +02:00
yoyosource
46d22b66aa Fix IngameChatListener 2021-07-30 09:46:05 +02:00
yoyosource
d666689465 Fix IngameChatListener 2021-07-30 09:44:55 +02:00
yoyosource
67566c2327 Merge branch 'master' into discord-bot 
# Conflicts:
#	src/de/steamwar/bungeecore/bot/listeners/IngameChatListener.java
 2021-07-30 09:16:04 +02:00
yoyosource
4f83b67cab Hotfix at mentions in Discord 2021-07-30 00:55:56 +02:00
yoyosource
8d6f40601c Hotfix IngameChatListener 2021-07-30 00:52:14 +02:00
yoyosource
d13e6a56a6 Hotfix IngameChatListener 2021-07-30 00:51:32 +02:00
yoyosource
fd45a9873e Hotfix IngameChatListener 2021-07-30 00:47:20 +02:00
yoyosource
a452ee6faf Hotfix ChatListener 2021-07-30 00:42:55 +02:00
yoyosource
4390de1739 Hotfix IngameChatListener 2021-07-30 00:41:58 +02:00
yoyosource
664ea28ba6 Hotfix IngameChatListener 2021-07-30 00:41:19 +02:00
yoyosource
3db7dc7c35 Hotfix IngameChatListener 2021-07-30 00:41:03 +02:00
yoyosource
95b3fd9821 Fix BungeeCore.properties 2021-07-30 00:18:51 +02:00
yoyosource
7394cc859c Fix SlashCommandListener 2021-07-29 22:22:43 +02:00