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

901 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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
YoyoNow
4a264734f6 Merge pull request 'Fix Poll Commands' (#274) from fix_poll_command into master 
Reviewed-on: SteamWar/BungeeCore#274
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-12-05 12:55:31 +01:00
Chaoscaot
d3d48d9514 Fix Poll Commands 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-12-05 12:54:39 +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
f975c4c867 Merge pull request 'Using new config' (#269) from configRefactoring into master 
Reviewed-on: SteamWar/BungeeCore#269
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-12-02 14:26:12 +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
3ff348fbc5 Merge pull request 'GDPR query processor' (#271) from dsgvo-query into master 
Reviewed-on: SteamWar/BungeeCore#271
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-12-02 08:37:44 +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
YoyoNow
f192deaeea Merge pull request 'Fix CheckCommand' (#270) from check_fix into master 
Reviewed-on: SteamWar/BungeeCore#270
 2021-11-20 21:06:14 +01:00
Chaoscaot
d31f3a31d1 Fix CheckCommand 
Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-11-20 21:05:34 +01:00
Lixfel
d6961419e6 Merge pull request 'Changing to Schemnodes' (#190) from schem_nodes into master 
Reviewed-on: SteamWar/BungeeCore#190
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-11-20 13:17:31 +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
1588e74116 Merge pull request 'Reduce OOM-Crashes' (#267) from lessBauCrashes into master 
Reviewed-on: SteamWar/BungeeCore#267
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-26 20:16:28 +02: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
b4d22eaf28 Merge pull request 'Ciao on OutOfMemory!' (#265) from stability into master 
Reviewed-on: SteamWar/BungeeCore#265
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-24 19:38:15 +02:00
Lixfel
9ba20d7426 Ciao on OutOfMemory! 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 16:26:27 +02:00
Lixfel
1c905967c1 Merge pull request 'Improved stability' (#264) from stability into master 
Reviewed-on: SteamWar/BungeeCore#264
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-22 20:16:44 +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
f798c1bf8c Merge pull request 'Fix whois NPE on never connected user' (#262) from whoisFix into master 
Reviewed-on: SteamWar/BungeeCore#262
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-10 11:12:07 +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