958 Commits

Autor	SHA1	Nachricht	Datum
Lixfel	51fd1ea35a	Fix badlion ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-01-02 21:19:43 +01:00
Lixfel	f75e24787f	Implement execute command handler for lobby ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-01-02 11:31:57 +01:00
zOnlyKroks	b77cce9921	.	2022-01-01 18:43:43 +01:00
zOnlyKroks	891eb0db92	Merge remote-tracking branch 'origin/Playtime_Command' into Playtime_Command	2022-01-01 12:24:42 +01:00
zOnlyKroks	20dc8fca3e	.	2022-01-01 12:24:36 +01:00
YoyoNow	5cd798a350	Merge branch 'master' into bot_upload	2022-01-01 11:36:11 +01:00
zOnlyKroks	82db0c597a	Merge branch 'master' into Playtime_Command	2021-12-31 22:26:54 +01:00
zOnlyKroks	7220051c18	Rework	2021-12-31 22:21:25 +01:00
Lixfel	77a4bfb970	Merge pull request 'Fix WhoisCommand' (#289) from active_punishments into master ... Reviewed-on: #289 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-12-31 13:34:52 +01:00
Chaoscaot	7dd2179612	Fix WhoisCommand ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-31 13:23:48 +01:00
Lixfel	4137d66607	Rebuild ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-12-31 09:02:38 +01:00
Chaoscaot	0ec38aed02	Fix Messages ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-30 22:09:21 +01:00
Chaoscaot	862176b0f0	Add Only Active Punishments on Whois ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-30 19:55:06 +01:00
Chaoscaot	533d33d2aa	Merge branch 'master' into bot_upload	2021-12-30 12:51:48 +01:00
Chaoscaot	f547667937	Doing PR Stuff ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-30 11:53:54 +01:00
zOnlyKroks	87db052478	Yoyo glücklich machen	2021-12-29 10:42:38 +01:00
zOnlyKroks	1cfa6359e8	Formatting	2021-12-29 10:38:05 +01:00
zOnlyKroks	01ff551213	Merge branch 'master' into Playtime_Command	2021-12-29 10:37:19 +01:00
zOnlyKroks	858e657974	Format	2021-12-29 10:30:15 +01:00
zOnlyKroks	071e88966e	Format	2021-12-29 10:23:58 +01:00
zOnlyKroks	94fe119330	Format	2021-12-29 10:19:53 +01:00
zOnlyKroks	1815c986d5	Format	2021-12-29 10:17:25 +01:00
zOnlyKroks	f1c85771a7	Format	2021-12-29 10:17:09 +01:00
zOnlyKroks	591395c64c	Format	2021-12-29 10:16:58 +01:00
zOnlyKroks	981be71d4e	Format	2021-12-29 10:15:24 +01:00
zOnlyKroks	73321e4b7e	Format	2021-12-29 10:11:39 +01:00
zOnlyKroks	803b591ff4	Format	2021-12-29 09:29:55 +01:00
Lixfel	35c16b1fae	Try with resources ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-12-28 16:16:16 +01:00
YoyoNow	c928c480f2	Merge branch 'master' into replaying	2021-12-28 11:33:47 +01:00
Lixfel	7ad4d73674	Nice Replay display ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-12-27 19:36:51 +01:00
Lixfel	581acd4891	Merge pull request 'Old Bug, New Fix' (#287) from old_bugs into master ... Reviewed-on: #287 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-12-27 18:54:17 +01:00
Chaoscaot	7730ea29fe	Old Bug, New Fix ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-27 18:14:45 +01:00
yoyosource	27b8fa969f	Update TablistManager	2021-12-27 14:15:21 +01:00
Lixfel	d6e01e6bae	Merge branch 'master' into replaying ... # Conflicts: # src/de/steamwar/bungeecore/BungeeCore.java # src/de/steamwar/bungeecore/SubserverSystem.java # src/de/steamwar/bungeecore/sql/Statement.java	2021-12-27 13:14:14 +01:00
Chaoscaot	98d06544ef	Doing PR Stuff ... Signed-off-by: Chaoscaot <chaoscaot444@gmail.com>	2021-12-25 22:44:29 +01:00
zOnlyKroks	6b0fb7ca6f	)	2021-12-24 17:37:53 +01:00
zOnlyKroks	86e9c17d73	Yoyo ist nen formatting freak	2021-12-24 17:36:22 +01:00
zOnlyKroks	896ea6b6d4	Formatting	2021-12-24 17:35:17 +01:00
zOnlyKroks	28f96c1708	Formatting	2021-12-24 17:29:41 +01:00
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: #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
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	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: #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: #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: #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: #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: #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: #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: #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: #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