1197 Commits

Autor	SHA1	Nachricht	Datum
yoyosource	7a48584cbb	Update some stuff	2022-04-09 21:36:18 +02:00
yoyosource	4bdead92b5	Update some stuff	2022-04-09 21:30:52 +02:00
Lixfel	d67c9bac66	Merge pull request 'Show eventfights as finished immediatly' (#340) from instantEventend into master ... Reviewed-on: #340 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-09 21:06:56 +02:00
Lixfel	89f525adb4	Merge pull request 'Update some stuff' (#339) from FabricModStuff into master ... Reviewed-on: #339 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:58:27 +02:00
Lixfel	dbe2349f4f	Merge pull request 'Button Spliting' (#336) from buttons into master ... Reviewed-on: #336 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-09 20:57:46 +02:00
Lixfel	eb8a8a2e07	Show eventfights as finished immediatly ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-09 16:58:51 +02:00
Lixfel	1bc5011d4f	Prevent ProcessingSpam ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:21:45 +02:00
Lixfel	4f6bf71f82	Fix tp ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-08 13:12:00 +02:00
yoyosource	c367f11120	Update some stuff	2022-04-06 20:19:38 +02:00
Chaoscaot	f5eaadba4f	🎨 Now?	2022-04-06 18:33:44 +02:00
Chaoscaot	081a1d42ff	Merge branch 'master' into arena_merging_2.0	2022-04-06 18:32:05 +02:00
yoyosource	d585a6fa09	Merge remote-tracking branch 'origin/Ranked' into Ranked	2022-04-06 17:01:37 +02:00
yoyosource	169d26852c	Update some stuff	2022-04-06 17:01:33 +02:00
YoyoNow	519e732310	Merge branch 'master' into Ranked	2022-04-06 16:59:21 +02:00
yoyosource	9a0b3a41b9	Update some stuff	2022-04-06 16:59:11 +02:00
YoyoNow	d0e4690b8d	Merge branch 'master' into FabricModStuff	2022-04-05 19:57:10 +02:00
yoyosource	4c9ac4a984	Revert some stuff	2022-04-05 19:50:41 +02:00
yoyosource	6b8d46d75a	Revert some stuff	2022-04-05 19:47:48 +02:00
yoyosource	7b5ce77e93	Revert some stuff	2022-04-05 19:47:08 +02:00
yoyosource	3af6f43ccd	Revert some stuff	2022-04-05 19:40:50 +02:00
yoyosource	ac8bcdd987	Update stuff	2022-04-05 19:40:08 +02:00
YoyoNow	f097d97554	Merge pull request 'Add new punishments' (#327) from Punishment++ into master ... Reviewed-on: #327 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-05 19:30:17 +02:00
yoyosource	c8c4ee0039	Update some stuff	2022-04-05 19:25:42 +02:00
yoyosource	c05a2e4ae6	Update some stuff	2022-04-05 19:24:04 +02:00
yoyosource	a8507a1920	Update some stuff	2022-04-05 19:02:25 +02:00
zOnlyKroks	e4268efd8b	Remove Redundant Message when switching Servers	2022-04-05 18:25:17 +02:00
zOnlyKroks	5a9b79e980	Remove Redundant Message when switching Servers	2022-04-05 18:24:41 +02:00
zOnlyKroks	9ef4062d4a	Remove Redundant Message when switching Servers	2022-04-05 18:24:23 +02:00
zOnlyKroks	cb52e0bc38	Remove Redundant Message when switching Servers	2022-04-05 18:12:51 +02:00
Chaoscaot	39926d8767	🎨 Yeet	2022-04-04 22:59:30 +02:00
yoyosource	350ac8b66f	Update some stuff	2022-04-04 20:00:21 +02:00
yoyosource	c2219dec4e	Update stuff	2022-04-04 18:23:18 +02:00
YoyoNow	77efb4a97f	Merge branch 'master' into Ranked	2022-04-04 18:21:14 +02:00
yoyosource	d48c81c610	Hotfix stuff	2022-04-03 23:25:08 +02:00
Chaoscaot	cae6427c6a	Merge remote-tracking branch 'origin/arena_merging_2.0' into arena_merging_2.0	2022-04-03 20:58:28 +02:00
Chaoscaot	fa8c1c9004	✅ PR Stuff	2022-04-03 20:58:21 +02:00
YoyoNow	ba117806fb	Merge branch 'master' into Punishment++	2022-04-03 20:57:49 +02:00
yoyosource	d736c07f00	Hotfix stuff	2022-04-03 20:57:30 +02:00
Lixfel	bc96ab6d96	Reduce message spam through asynchronity ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-02 17:51:14 +02:00
Lixfel	f8c13b627b	Merge branch 'master' into multiSQLConnections	2022-04-02 16:51:56 +02:00
yoyosource	186e60e100	Hotfix CheckCommand	2022-04-02 11:15:54 +02:00
Lixfel	ba0c2623f8	Fix checkcommand ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-02 08:47:28 +02:00
Lixfel	c56f221ffc	Fix checkcommand ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-02 08:46:16 +02:00
Lixfel	2a5ebe51aa	Revert april ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-02 08:12:56 +02:00
Chaoscaot	7a04359ecb	Merge branch 'master' into arena_merging_2.0	2022-04-01 18:00:50 +02:00
Lixfel	3755463c7e	Fix error message ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-01 17:09:40 +02:00
Lixfel	1da5c45b22	Allow sql connection parallelity ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-01 17:08:08 +02:00
Lixfel	65cdc5b69c	Merge pull request 'Update CheckCommand' (#330) from CheckList into master ... Reviewed-on: #330 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-01 16:08:27 +02:00
Lixfel	97a3ffb3fa	Merge pull request 'Improve error logging' (#326) from improveLogging into master ... Reviewed-on: #326 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-01 16:01:54 +02:00
Lixfel	02e13f5d9e	Merge pull request 'Announce event fights on spectate' (#325) from announceSpectate into master ... Reviewed-on: #325 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-04-01 16:01:46 +02:00
yoyosource	c4523521f7	Update some stuff	2022-04-01 15:57:42 +02:00
yoyosource	738189593d	Update some stuff	2022-04-01 15:31:45 +02:00
yoyosource	200c8eb17e	Update some stuff	2022-04-01 15:13:22 +02:00
yoyosource	b5528a6c60	Update some stuff	2022-04-01 13:26:05 +02:00
yoyosource	8ce2b9ab71	Fix FightEndsHandler.fightRange	2022-04-01 13:11:48 +02:00
yoyosource	afa9b4e533	Add Replay	2022-04-01 12:28:05 +02:00
yoyosource	000c58f261	Merge remote-tracking branch 'origin/Ranked' into Ranked	2022-04-01 12:23:14 +02:00
yoyosource	a26e3994a3	Fix FightEndsHandler	2022-04-01 12:23:08 +02:00
YoyoNow	d9cd3467a4	Merge branch 'master' into Ranked	2022-04-01 12:21:16 +02:00
yoyosource	895ac9843b	Update FightEndsHandler	2022-04-01 12:19:56 +02:00
yoyosource	bbd2b1950b	Update FightEndsHandler	2022-04-01 12:05:41 +02:00
Lixfel	af61b59c8b	Merge pull request 'Fix ChatListener for discord messages' (#331) from FixDiscord into master ... Reviewed-on: #331 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-01 10:58:58 +02:00
Lixfel	03befa42c0	Fix Season ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-01 10:58:21 +02:00
yoyosource	a8f9199c0f	Fix ChatListener for discord messages	2022-04-01 10:56:50 +02:00
yoyosource	cbc1dd6505	Update some stuff	2022-04-01 10:55:29 +02:00
YoyoNow	54700ce85c	Merge branch 'master' into improveLogging	2022-04-01 09:42:58 +02:00
YoyoNow	eaa1e873d2	Merge branch 'master' into announceSpectate	2022-04-01 09:42:22 +02:00
YoyoNow	10b14d2930	Merge branch 'master' into Punishment++	2022-04-01 09:41:30 +02:00
YoyoNow	e31a1b27e4	Merge branch 'master' into CheckList	2022-04-01 09:38:53 +02:00
yoyosource	b70f9898d1	Update CheckCommand	2022-04-01 09:38:44 +02:00
yoyosource	3ba59c8476	Update CheckCommand	2022-04-01 09:38:17 +02:00
YoyoNow	5874cfc30f	Merge branch 'master' into april	2022-04-01 09:08:57 +02:00
Lixfel	7293f741c7	„src/de/steamwar/bungeecore/sql/UserGroup.java“ ändern	2022-03-31 23:50:28 +02:00
Chaoscaot	143cc279d3	🐛 Use it now	2022-03-31 23:02:26 +02:00
Chaoscaot	ef8e5a3a0d	✨ Add Arena Merging 2.0	2022-03-31 23:01:20 +02:00
Chaoscaot	a09ee03937	🎨 Using code that is already Present	2022-03-31 22:49:24 +02:00
yoyosource	029285aaba	Revert "Add SilentMute Punishment type" ... This reverts commit ee4090941e.	2022-03-31 15:46:48 +02:00
yoyosource	b85cb000ac	Update messages	2022-03-31 13:57:40 +02:00
yoyosource	ee4090941e	Add SilentMute Punishment type	2022-03-31 12:49:55 +02:00
yoyosource	b59189ec48	Add NoFightServer Punishment type	2022-03-31 12:38:22 +02:00
Lixfel	3b358a8666	Fix GDPRQuery ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 18:34:21 +02:00
Lixfel	385f5a5a36	Fix concurrency ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 18:32:07 +02:00
Lixfel	8ce1d66817	Add Connection reset ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 18:27:51 +02:00
Lixfel	5838f6ed69	Improve error logging ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 16:49:40 +02:00
Lixfel	fa79a64d6b	Announce event fights on spectate ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 16:49:21 +02:00
Lixfel	82bd4b752d	Fix 1.18 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 14:43:54 +02:00
Lixfel	f4512f1db9	Merge pull request '1.18 Bau' (#324) from 1.18bau into master ... Reviewed-on: #324 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-03-30 14:32:12 +02:00
Lixfel	bc8db04edf	1.18 Bau ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 11:38:29 +02:00
Lixfel	9a17bb87f6	Remove unrequired commands ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-30 10:39:47 +02:00
Lixfel	d2d8e8af6d	Hotfix name issue ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-27 21:08:52 +02:00
zOnlyKroks	756b4da84e	Fix Errors	2022-03-24 13:59:14 +01:00
zOnlyKroks	98326fcaa0	Fix Errors	2022-03-23 19:24:44 +01:00
zOnlyKroks	a7525dd8a1	Fix Error	2022-03-23 17:04:38 +01:00
zOnlyKroks	1675b1dc9c	Fix Error	2022-03-23 17:03:31 +01:00
zOnlyKroks	d500c376fa	Messages	2022-03-23 17:02:42 +01:00
zOnlyKroks	626a876f0f	Merge branch 'master' into fabric_mod_sender	2022-03-23 16:50:54 +01:00
Lixfel	72a5027de0	Fix precision ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-22 19:07:47 +01:00
Lixfel	8492bc447a	1.4. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-22 17:18:20 +01:00
Lixfel	c380bd82d3	Tutorial deletion option ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-22 11:46:34 +01:00
yoyosource	577503114d	Maybe now?	2022-03-22 10:42:47 +01:00
yoyosource	91f7f5edfc	Add tutorial rate command	2022-03-22 10:37:10 +01:00
Lixfel	85017b1440	Merge branch 'master' into tutorial	2022-03-22 09:23:13 +01:00
Lixfel	364422af2f	Tutorial release mechanism ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-22 09:21:15 +01:00
yoyosource	0881878aa5	Fix stuff	2022-03-20 21:54:33 +01:00
Lixfel	e2fd1754ce	Fix some bugs + minor improvements ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-20 19:08:55 +01:00
Lixfel	58dd7486f7	Merge branch 'master' into tutorial	2022-03-20 16:19:53 +01:00
Lixfel	908e54fedd	Server start refactoring, tutorial system ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-19 16:10:09 +01:00
yoyosource	19de4fd1d8	Fix Ranked calculation	2022-03-16 20:02:16 +01:00
Lixfel	87dbca480e	Tutorial first steps ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-16 18:38:45 +01:00
Lixfel	6489ae51cf	Merge pull request 'Fix Message again for the final time!' (#313) from ResourceBundles2.0 into master ... Reviewed-on: #313	2022-03-16 16:38:45 +01:00
Lixfel	c08bfe75b9	Fix ConcurrentModificationException ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-16 16:30:38 +01:00
Lixfel	f04ccc6ea7	Fix emblems ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-16 16:25:43 +01:00
Lixfel	c0301a8014	Code simplification ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-16 16:24:19 +01:00
Lixfel	46499633d0	Code cleanup, cache invalidation fixes ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-16 14:56:37 +01:00
yoyosource	9a1f067dcd	Merge remote-tracking branch 'origin/ResourceBundles2.0' into ResourceBundles2.0	2022-03-15 19:05:20 +01:00
yoyosource	1f50bf15aa	Fix Message	2022-03-15 19:05:08 +01:00
YoyoNow	fe2097b68f	Merge branch 'master' into ResourceBundles2.0	2022-03-15 18:51:42 +01:00
yoyosource	e038f807e9	Hotfix FightEndsHandler	2022-03-15 18:31:47 +01:00
yoyosource	1fd34f8ccd	Update Message stuff	2022-03-15 18:12:55 +01:00
yoyosource	a78da0e2cf	Update Message stuff	2022-03-15 18:00:28 +01:00
yoyosource	8ee960e002	Fix message	2022-03-15 17:54:10 +01:00
yoyosource	4df39ebe75	Fix Message again for the final time!	2022-03-15 17:53:50 +01:00
yoyosource	9accdb599e	Fix Message again for the final time!	2022-03-15 17:18:16 +01:00
yoyosource	01b500e2e7	Fix Message again for the final time!	2022-03-15 17:16:08 +01:00
yoyosource	189c2e7f71	Merge remote-tracking branch 'origin/Ranked' into Ranked	2022-03-15 15:12:43 +01:00
yoyosource	7ccfef823c	Update BungeeCore.properties	2022-03-15 15:12:32 +01:00
YoyoNow	1fd55fde39	Merge branch 'master' into Ranked	2022-03-15 15:11:02 +01:00
yoyosource	6ddfe27ed1	Remove useless sout	2022-03-15 14:23:28 +01:00
yoyosource	9047c8ef6a	Fix Message	2022-03-15 14:22:12 +01:00
YoyoNow	080a9a9e34	Merge branch 'master' into MaybeFixResouceBundle	2022-03-15 13:27:45 +01:00
yoyosource	641c165782	Fix emblem not being the highest	2022-03-15 13:25:37 +01:00
yoyosource	6f5a3c352f	Fix emblem not being the highest	2022-03-15 13:23:37 +01:00
yoyosource	bd9e3e5d94	Maybe fix resource bundle	2022-03-15 11:40:20 +01:00
yoyosource	527576aa14	Fix UserElo	2022-03-15 11:26:21 +01:00
yoyosource	0d888dff1c	Update RankCommand	2022-03-15 10:35:11 +01:00
yoyosource	5bcd094080	Update RankCommand	2022-03-15 10:19:18 +01:00
yoyosource	6a6e7046d6	Update RankCommand	2022-03-15 10:16:26 +01:00
Lixfel	23f8e687ad	Fix Placement ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-15 10:03:00 +01:00
Lixfel	f8b0d13676	Fix String ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-15 10:00:47 +01:00
Lixfel	ca4a0c2022	Fix class ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-15 09:53:24 +01:00
YoyoNow	265dfd4904	Merge branch 'master' into Ranked	2022-03-15 09:47:40 +01:00
yoyosource	0b08732817	Update UserElo	2022-03-15 09:47:27 +01:00
Lixfel	8001f91992	Merge pull request 'New replay available calc + admin replay' (#309) from adminReplay into master ... Reviewed-on: #309 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2022-03-15 08:23:16 +01:00
yoyosource	92c0e58590	Update UserElo	2022-03-14 20:05:16 +01:00
yoyosource	af978cab2b	Update RankCommand	2022-03-14 19:11:07 +01:00
yoyosource	404c4c735b	Add RankCommand	2022-03-14 19:09:17 +01:00
Lixfel	6993ccce05	Fix member color ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-14 14:15:28 +01:00
Lixfel	9bf2e6e354	New replay available calc + admin replay ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-14 11:34:41 +01:00
Lixfel	0964ca78ab	Fix database insertion ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-13 21:04:22 +01:00
Lixfel	d22abd0707	Fix database insertion ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-03-13 21:01:57 +01:00