839 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
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: #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	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: #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
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	9da2228806	Merge branch 'master' into Punishment++	2021-09-27 16:57:23 +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
Lixfel	5f2465ddfc	Merge pull request 'Fix Node NumberFormatException' (#251) from Node into master ... Reviewed-on: #251 Reviewed-by: Lixfel <lixfel@steamwar.de>	2021-09-27 16:52:44 +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
YoyoNow	b18b4a73d3	Merge branch 'master' into Punishment++	2021-09-27 15:58:39 +02:00
Lixfel	5b5a1796ef	Add steamwarci script ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-09-27 15:23:20 +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	4d563983f8	Merge pull request 'Object oriented subserver node system' (#245) from nodeSystem into master ... Reviewed-on: #245 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-09-17 07:48:15 +02:00
Lixfel	563a5f45f6	Merge branch 'master' into nodeSystem ... # Conflicts: # src/de/steamwar/bungeecore/BungeeCore.java	2021-09-17 07:47:22 +02:00
Lixfel	14d0fd8615	Merge pull request 'New ErrorLogger implementation matching new SpigotCore implementation' (#244) from newErrorLogger into master ... Reviewed-on: #244 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-09-17 07:45:30 +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	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