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

885 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
866d57f8dc WIP GDPR query processor 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-23 19:27:03 +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
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
Lixfel
89f1a17c91 Hotfix tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-08 07:25:06 +02:00
Lixfel
bf2a4822ef Merge pull request 'Use new FightInfo + Tablist refactoring' (#234) from fightInfoPacket into master 
Reviewed-on: SteamWar/BungeeCore#234
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-08 07:11:28 +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
Lixfel
dc83c2bda1 Merge pull request 'Fix discord bot shutdown' (#254) from fixShutdown into master 
Reviewed-on: SteamWar/BungeeCore#254
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-05 12:13:46 +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
Lixfel
f270985f8f Merge pull request 'Making listener stuff volatile to fix NPE's with multiple threads accessing them' (#253) from BetterInit into master 
Reviewed-on: SteamWar/BungeeCore#253
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2021-10-01 11:54:06 +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