1125 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	c74873b75c	Merge pull request 'Fix TablistManager' (#283) from FixTablist into master ... Reviewed-on: #283 Reviewed-by: Lixfel <lixfel@steamwar.de>	2021-12-22 17:09:58 +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	b6be4a68ba	Merge pull request 'Prevent arena start dos' (#280) from dosPrevention into master ... Reviewed-on: #280 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-12-21 21:06:55 +01:00
Lixfel	864c51c3d9	Prevent arena start dos ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-12-19 16:50:29 +01:00
Lixfel	a132aafcbc	Merge pull request 'Add better Tablist Slim behaviour' (#278) from BetterTabListSlimBehaviour into master ... Reviewed-on: #278 Reviewed-by: Lixfel <lixfel@steamwar.de>	2021-12-19 08:25:28 +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
Lixfel	db6f134b4c	Merge pull request 'Fix Bans on lndi' (#276) from fix_multiban into master ... Reviewed-on: #276 Reviewed-by: Lixfel <lixfel@steamwar.de>	2021-12-16 17:19:32 +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: #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: #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
YoyoNow	4a264734f6	Merge pull request 'Fix Poll Commands' (#274) from fix_poll_command into master ... Reviewed-on: #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	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: #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: #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: #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: #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: #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: #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: #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: #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