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

804 Commits

Autor SHA1 Nachricht Datum
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
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
yoyosource
850a0d212e Add BanCommand and MuteCommand 2021-07-29 22:20:15 +02:00
yoyosource
10cc652c39 Fix SlashCommandListener 2021-07-29 20:35:02 +02:00
yoyosource
a0f9764a4b Add SlashCommandListener 
Add WhoisCommand
 2021-07-29 20:27:43 +02:00
yoyosource
df990e3bc9 Fix DiscordRulesMessage 
Fix DiscordSchemAlert
Fix DiscordTicketMessage
 2021-07-29 18:23:47 +02:00
yoyosource
1a8e8690ac Add SchematicsManager 
Fix '1 Spielern' to '1 Spieler'
 2021-07-29 18:14:29 +02:00
yoyosource
54499a7c3e Add BanCommand 
Add MuteCommand
 2021-07-29 17:22:50 +02:00
yoyosource
d9c819d096 Fix ChatListener for Discord chat 2021-07-29 17:08:31 +02:00
yoyosource
b7164cf005 Fix privateChat with Bot 2021-07-29 17:04:07 +02:00
yoyosource
a8d00de1e2 Remove massive resend 2021-07-29 16:56:58 +02:00
yoyosource
a0482c8867 Merge branch 'master' into discord-bot 2021-07-29 16:45:55 +02:00
yoyosource
268fa2d508 Add IngameChatListener 
Add ServerTeamchatCommand
 2021-07-29 16:40:39 +02:00
yoyosource
3394968b9e Hotfix BungeeCore 2021-07-29 00:18:39 +02:00
yoyosource
3c253eaca5 Hotfix BungeeCore 2021-07-29 00:14:28 +02:00
yoyosource
4b7a76ae2f Hotfix BungeeCore 2021-07-29 00:13:59 +02:00
yoyosource
e978d7f0ca Hotfix DiscordRanks 2021-07-29 00:10:44 +02:00
YoyoNow
daa800a182 Merge branch 'master' into discord-bot 2021-07-29 00:02:40 +02:00
Chaoscaot
7d2ebed84c Add Schem alert 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-07-29 00:02:16 +02:00
YoyoNow
342f0cf7cc Merge branch 'master' into Tablist 2021-07-29 00:00:06 +02:00
Chaoscaot
1576d74900 Add Nick and Message 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-07-28 22:34:44 +02:00
Chaoscaot
cc1eb7dd74 Add Nick and Message 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-07-28 22:34:01 +02:00
Chaoscaot
3179c626ca Adjust Message 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-07-28 22:00:13 +02:00
Chaoscaot
111e65281a Adjusting Color 2021-07-28 21:41:23 +02:00
Chaoscaot
8de19123b9 Latest and Greatest 2021-07-28 21:39:35 +02:00
yoyosource
95ab4d3344 Fix DiscordRanks 2021-07-28 21:13:44 +02:00
yoyosource
aeaed0db99 Fix DiscordRanks 2021-07-28 21:00:10 +02:00
yoyosource
293ac47b58 Add DiscordRanks 2021-07-28 20:57:44 +02:00
yoyosource
80a5b0e0a4 Add DiscordRanks 2021-07-28 20:55:57 +02:00
yoyosource
398b3e9b5a Add DiscordRanks 2021-07-28 20:41:46 +02:00
yoyosource
f3a448a68e Merge remote-tracking branch 'origin/discord-bot' into discord-bot 2021-07-28 20:29:56 +02:00
yoyosource
2579e7adcb Add DiscordRanks 2021-07-28 20:29:48 +02:00
Chaoscaot
9834bd7f30 update emoji 2021-07-28 20:15:14 +02:00
Chaoscaot
c9a5f468da Add Steamwar Discord Auth 2021-07-28 20:13:31 +02:00
yoyosource
31a07c30e2 Add AnnouncementListener 2021-07-28 18:30:49 +02:00
yoyosource
536d503f6e Add AnnouncementListener 2021-07-28 18:26:12 +02:00
Chaoscaot
22523fa5be Discord Ticket System 2021-07-28 18:15:40 +02:00
yoyosource
eda6a199fa Fix EventManager 2021-07-28 17:38:46 +02:00
yoyosource
d9607e86ce Fix EventManager 2021-07-28 17:28:21 +02:00
yoyosource
d2e02695b6 Fix SteamwarDiscordBot 2021-07-28 17:12:02 +02:00
yoyosource
ad3bd05498 Fix EventManager 2021-07-28 17:11:00 +02:00
yoyosource
dd35ca4d8d Fix EventManager 2021-07-28 17:00:55 +02:00
yoyosource
d5a4e47651 Fix EventManager 2021-07-28 17:00:34 +02:00
yoyosource
213018ac4c Fix SteamwarDiscordBot 2021-07-28 16:52:46 +02:00
yoyosource
bb404ef9dd Fix SteamwarDiscordBot 2021-07-28 16:51:54 +02:00
yoyosource
8bab33942e Add EventManager 2021-07-28 16:45:25 +02:00
yoyosource
da13f8d546 Add SteamwarDiscordBot presence 2021-07-28 16:04:21 +02:00
yoyosource
b6f9a5a60d Add SteamwarDiscordBot presence 2021-07-28 16:02:27 +02:00
yoyosource
a4c9c25373 Add SteamwarDiscordBot presence 2021-07-28 16:02:13 +02:00
yoyosource
2bfc37ae84 Add SteamwarDiscordBot presence 2021-07-28 15:55:47 +02:00
yoyosource
a07c82bc13 Add SteamwarDiscordBot presence 2021-07-28 15:54:57 +02:00
yoyosource
2c46d2e6a3 Add SteamwarDiscordBot rich presence 2021-07-28 15:33:18 +02:00
yoyosource
dcfa2c701a Add SteamwarDiscordBot rich presence 2021-07-28 15:30:34 +02:00
Chaoscaot
7921cca38e Add DiscordBot 2021-07-28 15:28:08 +02:00
yoyosource
5135d5d132 Add SteamwarDiscordBot rich presence 2021-07-28 15:15:01 +02:00
yoyosource
6a036808d5 Add SteamwarDiscordBot rich presence 2021-07-28 15:14:14 +02:00
yoyosource
f6e6c191a7 Add SteamwarDiscordBot rich presence 2021-07-28 15:12:05 +02:00
Chaoscaot
01cf6fdb58 Add DiscordBot 2021-07-28 15:06:40 +02:00
yoyosource
91e5733a00 Fix TablistManager 2021-07-26 20:47:48 +02:00
Chaoscaot
5576d1e3ca Update! 2021-07-18 19:40:53 +02:00
Chaoscaot
763a27e7ba Merge branch 'master' into schem_nodes 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/CheckCommand.java
 2021-07-16 15:12:43 +02:00
yoyosource
4a4f185c81 Hotfix StatCommand for no stats 2021-07-12 09:33:54 +02:00
yoyosource
73940661c9 Hotfix StatCommand for no stats 2021-07-12 09:32:58 +02:00
yoyosource
d1b764eb88 Hotfix StatCommand for no stats 2021-07-12 09:32:13 +02:00
yoyosource
e07000ed62 Merge branch 'master' into ListCommand 
# Conflicts:
#	src/de/steamwar/bungeecore/BungeeCore.java
 2021-07-12 09:26:35 +02:00
YoyoNow
b6bd72101b Merge branch 'master' into DevServer 2021-07-12 09:21:39 +02:00
YoyoNow
57f84002ba Merge branch 'master' into Better7Sanitize 2021-07-12 09:21:04 +02:00
YoyoNow
90e0d1bb44 Merge branch 'master' into plus_local_chat 2021-07-12 09:15:29 +02:00
YoyoNow
b2c8fd7290 Merge branch 'master' into plus_local_chat 2021-07-12 09:13:28 +02:00
YoyoNow
e3893ce7d4 Merge branch 'master' into StatCommand 2021-07-12 09:06:35 +02:00
YoyoNow
e68e477868 Merge branch 'master' into ListCommand 2021-07-12 09:06:29 +02:00
YoyoNow
7245c3aa1c Merge branch 'master' into DevServer 2021-07-12 07:37:36 +02:00
yoyosource
587395002a Better 7 sanitize 2021-07-11 13:23:29 +02:00
yoyosource
c8bc438b0c Hotfix color codes for WGS winners 2021-07-11 13:02:30 +02:00
yoyosource
86664ea399 Fix Typo 2021-07-11 08:24:54 +02:00
yoyosource
1879f74ead Add DevCommand 2021-07-10 22:43:15 +02:00
yoyosource
b16b258ba2 Add DevCommand 2021-07-10 22:38:44 +02:00
yoyosource
47711b746e Add DevCommand 2021-07-10 22:04:56 +02:00
yoyosource
64c8af3064 Fix TablistManager 2021-06-28 17:27:29 +02:00
yoyosource
5637311be5 Hotfix Tablist 2021-06-28 17:06:00 +02:00
yoyosource
906be50771 Compress ChatListener.onPlusMessage 2021-06-27 08:10:15 +02:00
Chaoscaot
955cb8863a Remove Debug 2021-06-26 11:14:13 +02:00
Chaoscaot
c750231b14 Add + to Local Chat 2021-06-26 11:13:01 +02:00
yoyosource
ca281f5ef9 Merge remote-tracking branch 'origin/ListCommand' into ListCommand 2021-06-26 10:28:05 +02:00
yoyosource
c253709f4a Update ListCommand to multilang 2021-06-26 10:27:59 +02:00
YoyoNow
7a77ea0816 Merge branch 'master' into ListCommand 2021-06-26 10:24:14 +02:00
yoyosource
ad054d2b06 Remove ListCommand 2021-06-26 10:23:44 +02:00
yoyosource
e9297fab47 Add ListCommand 2021-06-26 10:22:55 +02:00
yoyosource
fa70a46b64 Remove useless checks 2021-06-26 08:09:23 +02:00
YoyoNow
f1f13da3d1 Merge branch 'master' into StatCommand 2021-06-26 08:07:23 +02:00
YoyoNow
e9bbc559c5 Merge branch 'master' into SlimTeamMemberTab 2021-06-26 08:06:31 +02:00
yoyosource
c925aa41ac Fix SubserverSystem concurrency and Thread safety 2021-06-25 18:28:21 +02:00
yoyosource
9e8a031230 Make Fight Server with one Player more visible 2021-06-25 17:48:47 +02:00