Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität
825 Commits 11 Branches 0 Tags 7,5 MiB
e9ee427c26
Commit graph

712 Commits

Autor SHA1 Nachricht Datum
Lixfel
e9ee427c26 Merge branch 'master' into fightInfoPacket 2021-10-08 07:10:59 +02:00
Lixfel
aebb37e10e Fix discord bot shutdown 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-02 07:48:21 +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
Lixfel
ef8928d3bd Better encapsulation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 10:41:58 +02:00
Lixfel
c3c666c305 Encapsulate DiscordBot errors 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 10:38:48 +02:00
Lixfel
f9b42ad0c1 Prevent username triggering 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 16:21:24 +02:00
Lixfel
33924752c8 Fix unregistering 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 12:30:11 +02:00
Lixfel
5bcc87aa1e Fix autoreconnect 
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 
Reviewed-on: SteamWar/BungeeCore#242
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-09-30 12:20:26 +02:00
Lixfel
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
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
Lixfel
1d8966865f Merge branch 'master' into long_discord 2021-09-27 16:28:46 +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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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: SteamWar/BungeeCore#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
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