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

919 Commits

Autor SHA1 Nachricht Datum
zOnlyKroks
9b487e929c Fixes 2021-12-24 17:16:01 +01:00
zOnlyKroks
6c6ecfccb3 Merge branch 'master' into Playtime_Command 2021-12-24 11:17:29 +01:00
zOnlyKroks
d72c8e612f Command implementation 2021-12-24 11:16:29 +01:00
Lixfel
5002b07748 Fix stack overflow 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-23 17:38:08 +01:00
Lixfel
39c7254963 Simplify code 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-22 17:09:16 +01:00
yoyosource
6e6cf76479 Update TablistManager 2021-12-22 11:38:00 +01:00
yoyosource
02883f2bea Update TablistManager 2021-12-22 11:29:43 +01:00
YoyoNow
adbf041135 Merge branch 'master' into FixTablist 2021-12-22 10:17:48 +01:00
yoyosource
0cc93f433e Fix TablistManager 2021-12-22 10:17:28 +01:00
Lixfel
864c51c3d9 Prevent arena start dos 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-19 16:50:29 +01:00
yoyosource
1087cdb74c Add better Tablist Slim behaviour 2021-12-18 14:20:35 +01:00
Lixfel
75b823f780 Fix renaming 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-17 06:52:08 +01:00
Chaoscaot
da9b5d82ab Merge branch 'master' into bot_upload 2021-12-16 17:24:26 +01:00
Chaoscaot
fe80ede6e0 Fix of 20+ Bans on lndi 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-16 17:10:27 +01:00
Lixfel
71befae83b Merge pull request 'Use default java instead of hardcoded java' (#275) from defaultJava into master 
Reviewed-on: SteamWar/BungeeCore#275
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-16 15:45:43 +01:00
Lixfel
191ccc6ed9 Merge pull request 'Fix possible world names for paper' (#273) from fixWorldNames into master 
Reviewed-on: SteamWar/BungeeCore#273
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-16 15:45:33 +01:00
Chaoscaot
8a43110100 Add Discord Bot Upload 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-12 20:40:25 +01:00
Lixfel
276cdf1762 Use default java instead of hardcoded java 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-11 16:54:06 +01:00
Lixfel
c98e2c381d Autopermabann on jndi:ldap 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-10 09:19:01 +01:00
Lixfel
defc261e5e Hotfix: No paper baus 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-10 09:08:47 +01:00
Chaoscaot
d3d48d9514 Fix Poll Commands 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-05 12:54:39 +01:00
Lixfel
87ccd1a6d8 Fix possible world names for paper 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-04 07:57:06 +01:00
Lixfel
3be85af4bb Merge pull request 'FAWE 1.12 should now be Java 16/17 compatible' (#272) from omniJ9 into master 
Reviewed-on: SteamWar/BungeeCore#272
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-12-02 21:37:32 +01:00
Lixfel
2dd8cf3f8b Fix check without rank 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-02 17:46:39 +01:00
Lixfel
78874e0800 FAWE 1.12 should now be Java 16/17 compatible 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-02 17:08:00 +01:00
Lixfel
9f7eca9689 Display sorted 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-02 09:41:53 +01:00
Lixfel
9fc112d882 Merge branch 'master' into configRefactoring 2021-12-02 08:46:58 +01:00
Lixfel
6bb90af3bc Fix loading of non startable gamemodes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-02 08:45:01 +01:00
Lixfel
582924fb7d GDPR query processor 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-25 14:47:37 +01:00
Lixfel
a6ea418047 WIP GDPR query processor 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-23 19:59:50 +01:00
Lixfel
866d57f8dc WIP GDPR query processor 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-23 19:27:03 +01:00
Lixfel
0339067295 Merge branch 'master' into configRefactoring 2021-11-23 11:26:43 +01:00
Chaoscaot
d31f3a31d1 Fix CheckCommand 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-11-20 21:05:34 +01:00
Chaoscaot
ea8e5831c4 Update from Spigot 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-11-20 11:29:04 +01:00
Chaoscaot
2e5f0de710 Everthings Tested! 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-11-14 12:00:29 +01:00
Lixfel
e32a223476 Using new config 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-12 17:14:56 +01:00
Chaoscaot
3ac81810c4 Fixing Merge Conflicts & Updating! 2021-11-12 15:52:15 +01:00
Chaoscaot
a9172929be Merge remote-tracking branch 'origin/master' into schem_nodes 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/CheckCommand.java
#	src/de/steamwar/bungeecore/sql/CheckedSchematic.java
#	src/de/steamwar/bungeecore/sql/Schematic.java
#	src/de/steamwar/bungeecore/sql/SchematicMember.java
 2021-11-12 14:35:58 +01:00
Lixfel
75d5e00c68 Reduce OOM-Crashes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-26 17:08:48 +02:00
Lixfel
d6aefa9ec7 Merge pull request 'Comma seperated team info' (#266) from commaTeamInfo into master 
Reviewed-on: SteamWar/BungeeCore#266
 2021-10-25 09:17:36 +02:00
Lixfel
87641dbfc2 Prevent ConcurrentModException 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-25 09:16:01 +02:00
Lixfel
62681be8d4 Comma seperated team info 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-25 09:13:48 +02:00
Lixfel
9ba20d7426 Ciao on OutOfMemory! 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 16:26:27 +02:00
Lixfel
317df7b7a8 Improved stability 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-22 20:13:31 +02:00
Lixfel
eb8b5e3bc6 Fix tablist size 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-12 18:07:28 +02:00
Lixfel
1c3208934d Fix FAWE 1.9-1.12 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-12 13:42:47 +02:00
Lixfel
d37a68f373 Fix missing log4jconfiguration file 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-12 13:11:23 +02:00
Lixfel
bffbacc289 Merge remote-tracking branch 'origin/Punishment++' 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/DevCommand.java
#	src/de/steamwar/bungeecore/sql/SteamwarUser.java
 2021-10-12 11:54:41 +02:00
Lixfel
d7b6abb1ca Merge pull request 'Use OpenJ9' (#260) from openj9 into master 
Reviewed-on: SteamWar/BungeeCore#260
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-10-12 11:45:12 +02:00
Lixfel
7debcf1782 Merge pull request 'Fix tablist issues' (#261) from tablist into master 
Reviewed-on: SteamWar/BungeeCore#261
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-10-12 11:44:42 +02:00
Lixfel
adeb5de034 Fix whois NPE on never connected user 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-10 08:20:30 +02:00
Lixfel
2352410f2b Fix tablist issues 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-09 22:51:08 +02:00
Lixfel
0c5c9e7d42 Reduce arena RAM 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-09 21:53:50 +02:00
Lixfel
801d9da2e1 OpenJ9 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-09 16:06:31 +02:00
Lixfel
6210cdf16d WIP tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-09 16:06:14 +02:00
Lixfel
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
Lixfel
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
YoyoNow
53138d89f8 Merge branch 'master' into Punishment++ 2021-10-08 11:31:38 +02:00
Lixfel
9bf5146114 Hotfix tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-08 07:27:40 +02:00
Lixfel
89f1a17c91 Hotfix tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-08 07:25:06 +02:00
Lixfel
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
YoyoNow
2f0643779f Merge branch 'master' into Punishment++ 2021-10-06 11:16:47 +02:00
yoyosource
4f7ccf2028 Fix stuff 2021-10-02 21:24:32 +02:00
Lixfel
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
Lixfel
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
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
yoyosource
ecaba65f79 Update Punishment, messages not final 2021-09-30 13:47:21 +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
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
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
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
39ccff44a5 Fix performance and bugs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-16 12:43:22 +02:00
Lixfel
71e89fb44a Merge branch 'master' into replaying 2021-09-16 12:21:37 +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
Lixfel
8daedc4e74 Rework to new SQL api 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-11 09:26:14 +02:00
Lixfel
ef471c9ff9 Merge branch 'master' into replaying 
# Conflicts:
#	src/de/steamwar/bungeecore/sql/SteamwarUser.java
 2021-09-11 09:05:57 +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
Lixfel
40aacaae33 General replay starter 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-28 10:11:07 +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