1187 Commits

Autor	SHA1	Nachricht	Datum
yoyosource	f52444f6e5	Add some new punishments after talking with mods	2022-04-24 15:02:03 +02:00
Lixfel	f30b779347	Fix BrandListener performance ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 08:29:21 +02:00
Chaoscaot	7191531045	Merge remote-tracking branch 'origin/master' into arena_merging_2.0 ... # Conflicts: # src/de/steamwar/bungeecore/commands/FightCommand.java	2022-04-23 12:19:41 +02:00
yoyosource	cd5bc889a6	Fix pr stuff	2022-04-23 11:01:13 +02:00
yoyosource	39471cf468	Merge remote-tracking branch 'origin/Teamserver' into Teamserver	2022-04-23 10:54:45 +02:00
yoyosource	383cd6097c	Fix pr stuff	2022-04-23 10:54:38 +02:00
YoyoNow	c976e6f7ce	Merge branch 'master' into Teamserver	2022-04-22 21:37:02 +02:00
yoyosource	b744f5286f	Update some stuff	2022-04-22 21:36:55 +02:00
Lixfel	9ac5a8ef8a	Fix sends ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 18:47:21 +02:00
Lixfel	015a3cfa52	Fix broeadcasts ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:26:28 +02:00
Lixfel	329d80f037	Fix Arenaserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 17:10:32 +02:00
Lixfel	4d53e8ced9	Fix chatcolor, arenacommand ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 16:14:35 +02:00
yoyosource	b8a3512643	Add SubserverProtocolFixer	2022-04-22 15:55:34 +02:00
Lixfel	f1f334a750	Fix msg, tp etc. ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:44:42 +02:00
yoyosource	75a6114447	Merge branch 'master' into Teamserver ... # Conflicts: # src/de/steamwar/bungeecore/listeners/ChatListener.java	2022-04-22 15:23:39 +02:00
Lixfel	f8232fcb48	Fix chat no receiver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 15:16:33 +02:00
Lixfel	02fd7eb965	Fix discord targets ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-22 10:36:28 +02:00
Lixfel	4665d42fc7	Fix small issues ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-21 13:04:44 +02:00
Lixfel	c1048cfdbd	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-19 20:32:02 +02:00
Chaoscaot	0d6d342740	🐛 Fixes	2022-04-16 16:24:38 +02:00
Chaoscaot	c0f8f9274a	Merge branch 'master' into arena_merging_2.0	2022-04-16 16:13:18 +02:00
Chaoscaot	d854621752	🐛 Fixes	2022-04-16 16:13:10 +02:00
yoyosource	4a9ba9554a	Fix Teamserver integration	2022-04-16 09:54:40 +02:00
Lixfel	54932f6ebc	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 22:24:36 +02:00
Lixfel	0bf5a65850	Current state ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-14 20:44:09 +02:00
yoyosource	3e315ece3b	Merge remote-tracking branch 'origin/Teamserver' into Teamserver	2022-04-13 22:31:13 +02:00
yoyosource	2d3466aecb	Fix TeamCommand tablist	2022-04-13 22:30:53 +02:00
yoyosource	ea194d0f31	Fix TeamCommand	2022-04-13 22:21:08 +02:00
YoyoNow	6abf85718c	Merge branch 'master' into Teamserver	2022-04-13 22:02:48 +02:00
yoyosource	8191c134c7	Update local chat	2022-04-13 22:00:31 +02:00
yoyosource	acb7aa1efb	Update TeamCommand	2022-04-13 21:51:40 +02:00
yoyosource	10b6d2b38e	Update Team SQL api	2022-04-13 21:22:56 +02:00
Lixfel	336d4f6a3c	Fix NPE ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:55:51 +02:00
Lixfel	9dcb35a91e	Fix pipeline null errors ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-13 20:35:47 +02:00
YoyoNow	35bac7bbf7	Merge branch 'master' into BCCommands	2022-04-11 10:28:07 +02:00
yoyosource	b5bf48ce2a	Update /bc to allow commands	2022-04-11 10:27:49 +02:00
Lixfel	e3b9329de0	Merge pull request 'Ranked' (#333) from Ranked into master ... Reviewed-on: #333 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:23:12 +02:00
Lixfel	4a0c50a08d	Merge pull request 'Add Replay WIPISCH' (#334) from Replay into master ... Reviewed-on: #334 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-04-11 08:08:03 +02:00
yoyosource	e723224282	Fix Fabric stuff	2022-04-10 20:14:33 +02:00
Chaoscaot	190828692c	🐛 Fixing Punishment Errors	2022-04-10 19:20:16 +02:00
yoyosource	fa5d4ad983	Update some stuff	2022-04-09 22:08:17 +02:00
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