1536 Commits

Autor	SHA1	Nachricht	Datum
Lixfel	a4ad028f72	Fix imports ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-16 13:35:25 +02:00
Lixfel	dd9651d6c8	Merge pull request 'Update VerifyCommand' (#407) from CommandVerify into master ... Reviewed-on: #407 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:33:56 +02:00
Lixfel	d6e941bf72	Merge pull request 'Update WebregisterCommand' (#408) from CommandWebregister into master ... Reviewed-on: #408 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:33:09 +02:00
Lixfel	e156d3ad4a	Merge pull request 'Update WhoisCommand' (#409) from CommandWhois into master ... Reviewed-on: #409 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:32:22 +02:00
Lixfel	7c1925ad71	Merge pull request 'Update UnIgnoreCommand' (#406) from CommandUnIgnore into master ... Reviewed-on: #406 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:30:54 +02:00
Lixfel	3299620cd6	Merge pull request 'Update TutorialCommand' (#405) from CommandTutorial into master ... Reviewed-on: #405 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:30:30 +02:00
Lixfel	adee8f565b	Merge pull request 'Update StatCommand' (#402) from CommandStat into master ... Reviewed-on: #402 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:26:49 +02:00
Lixfel	01c721a753	Merge pull request 'Update SetLocaleCommand' (#401) from CommandSetLocale into master ... Reviewed-on: #401 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:26:27 +02:00
Lixfel	c3b3559875	Merge pull request 'Update ServerTeamchatCommand' (#400) from CommandServerTeamchat into master ... Reviewed-on: #400 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:25:54 +02:00
Lixfel	f00d1dc540	Merge pull request 'Update ServerSwitchCommand' (#399) from CommandServerSwitch into master ... Reviewed-on: #399 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:25:30 +02:00
Lixfel	c1a721cf4d	Merge pull request 'Update PollCommand' (#392) from CommandPoll into master ... Reviewed-on: #392 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:24:40 +02:00
Lixfel	60ca6fde85	Merge pull request 'Update ReplayCommand' (#398) from CommandReplay into master ... Reviewed-on: #398 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:24:08 +02:00
Lixfel	ecb3723c7c	Merge pull request 'Update RegelnCommand' (#397) from CommandRegeln into master ... Reviewed-on: #397 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:23:52 +02:00
Lixfel	6bcafde70c	Merge pull request 'Update RankCommand' (#396) from CommandRank into master ... Reviewed-on: #396 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:23:28 +02:00
Lixfel	90c1208cf5	Merge pull request 'Update RCommand' (#395) from CommandR into master ... Reviewed-on: #395 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:22:55 +02:00
Lixfel	5c534305d9	Merge pull request 'Update PunishmentCommand' (#394) from CommandPunishment into master ... Reviewed-on: #394 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:22:34 +02:00
Lixfel	f2a537da90	Merge pull request 'Update PollresultCommand' (#393) from CommandPollresult into master ... Reviewed-on: #393 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:17:45 +02:00
Lixfel	8ae6e90628	Merge pull request 'Update PlaytimeCommand' (#391) from CommandPlaytime into master ... Reviewed-on: #391 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:58 +02:00
Lixfel	7f5ef05235	Merge pull request 'Update PingCommand' (#390) from CommandPing into master ... Reviewed-on: #390 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:36 +02:00
Lixfel	7c898ac869	Merge pull request 'Update MsgCommand' (#389) from CommandMsg into master ... Reviewed-on: #389 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:14:14 +02:00
Lixfel	d55e2abdb4	Merge pull request 'Update LocalCommand' (#388) from CommandLocal into master ... Reviewed-on: #388 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:42 +02:00
Lixfel	734e8fc6c5	Merge pull request 'Update ListCommand' (#387) from CommandList into master ... Reviewed-on: #387 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:24 +02:00
Lixfel	045b693c92	Merge pull request 'Update KickCommand' (#386) from CommandKick into master ... Reviewed-on: #386 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:13:02 +02:00
Lixfel	0e430fee9b	Merge pull request 'Update IgnoreCommand' (#384) from CommandIgnore into master ... Reviewed-on: #384 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:11:18 +02:00
Lixfel	5bfac6c7b5	Merge pull request 'Update GDPRQuery' (#382) from CommandGDPRQuery into master ... Reviewed-on: #382 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:10:27 +02:00
Lixfel	1bfdecd6b0	Merge pull request 'Update EventreloadCommand' (#380) from CommandEventreload into master ... Reviewed-on: #380 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:03:28 +02:00
Lixfel	2aee854b5c	Merge pull request 'Update EventRescheduleCommand' (#379) from CommandEventReschedule into master ... Reviewed-on: #379 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:02:13 +02:00
Lixfel	41f89f5f0a	Merge pull request 'Update CheckCommand' (#377) from CommandCheck into master ... Reviewed-on: #377 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:00:46 +02:00
Lixfel	e46f68558a	Merge pull request 'Update DevCommand' (#378) from CommandDev into master ... Reviewed-on: #378 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 13:00:32 +02:00
Lixfel	dfb6f89b35	Merge pull request 'Update BugCommand' (#375) from CommandBug into master ... Reviewed-on: #375 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 12:50:48 +02:00
Lixfel	df9f6e44e3	Merge pull request 'Update AlertCommand' (#372) from CommandAlert into master ... Reviewed-on: #372 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-16 12:39:52 +02:00
yoyosource	4766e0ab96	Update WhoisCommand	2022-06-16 12:21:46 +02:00
yoyosource	d64a483bb6	Update WebregisterCommand	2022-06-16 12:19:23 +02:00
yoyosource	99807470ec	Update VerifyCommand	2022-06-16 12:18:15 +02:00
yoyosource	595929f4b2	Update UnIgnoreCommand	2022-06-16 12:17:01 +02:00
yoyosource	9e867a7457	Update TutorialCommand	2022-06-16 12:15:50 +02:00
yoyosource	29ed8b16b8	Update StatCommand	2022-06-16 11:19:50 +02:00
yoyosource	4cd0150042	Update SetLocaleCommand	2022-06-16 11:19:03 +02:00
yoyosource	b4b46b56a4	Update ServerTeamchatCommand	2022-06-16 11:18:13 +02:00
yoyosource	160136833e	Update ServerSwitchCommand	2022-06-16 11:16:47 +02:00
yoyosource	279577a536	Update ReplayCommand	2022-06-16 11:15:43 +02:00
yoyosource	67d816e90b	Update RegelnCommand	2022-06-16 11:10:19 +02:00
yoyosource	84ead29ddb	Update RCommand	2022-06-16 11:09:24 +02:00
yoyosource	21f020e13d	Update RankCommand	2022-06-16 11:08:12 +02:00
yoyosource	e4c07bc211	Update PunishmentCommand	2022-06-16 11:04:59 +02:00
yoyosource	a7541dc0c3	Update PollresultCommand	2022-06-16 10:57:12 +02:00
yoyosource	fd14666880	Update PollCommand	2022-06-15 20:18:31 +02:00
yoyosource	4134e564cc	Update PlaytimeCommand	2022-06-15 20:12:25 +02:00
yoyosource	6c301c987d	Update PingCommand	2022-06-15 20:11:21 +02:00
yoyosource	9f5e714912	Update MsgCommand	2022-06-15 20:10:09 +02:00
yoyosource	7236885590	Update LocalCommand	2022-06-15 20:07:29 +02:00
yoyosource	c6f9019ce3	Update ListCommand	2022-06-15 20:06:21 +02:00
yoyosource	19616aef84	Update KickCommand	2022-06-15 20:04:43 +02:00
yoyosource	8a21d5c93d	Enable SWTSI again	2022-06-14 22:53:22 +02:00
yoyosource	4fc0e69a47	Update IgnoreCommand	2022-06-14 21:56:04 +02:00
yoyosource	99f5fbc3b8	Update GDPRQuery	2022-06-14 21:49:20 +02:00
yoyosource	d85b93364e	Update EventRescheduleCommand	2022-06-14 21:42:05 +02:00
yoyosource	d0ac81aa93	Update EventreloadCommand	2022-06-14 21:31:48 +02:00
yoyosource	568f1bf598	Update DevCommand	2022-06-14 21:30:55 +02:00
yoyosource	d94080a0cb	Update CheckCommand	2022-06-14 21:20:45 +02:00
yoyosource	546e507939	Update BugCommand	2022-06-14 20:46:13 +02:00
yoyosource	5c55bdacde	Add tab completion to ArenaCommand	2022-06-14 20:16:36 +02:00
yoyosource	ae2a1d5779	Update ArenaCommand	2022-06-14 20:10:07 +02:00
yoyosource	08fdc1603e	Update AlertCommand	2022-06-14 20:03:40 +02:00
Lixfel	d83b6564d4	CI Rebuild ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 19:41:50 +02:00
yoyosource	8a417e32c1	Fix some stuff for later use	2022-06-14 18:19:25 +02:00
yoyosource	22ef3cd13d	Fix some stuff for later use	2022-06-14 18:16:44 +02:00
yoyosource	a0ae828fbd	Add SWCommand and corresponding api	2022-06-14 16:18:45 +02:00
yoyosource	bf4f7c6adf	Add ServerMetaInfo	2022-06-14 15:47:11 +02:00
Lixfel	7aadaa2df3	Fix communication ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:32:43 +02:00
Lixfel	b285585608	Fix packet direction ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:09:59 +02:00
Lixfel	07cb11e12b	Fix SWInventory ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 09:08:05 +02:00
Lixfel	571fa8c7d1	Fix concurrency, fix cast ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 08:56:09 +02:00
Lixfel	533f0a4269	Fix copyright ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-14 08:37:32 +02:00
Lixfel	41d27c567d	Merge branch 'master' into network ... # Conflicts: # src/de/steamwar/bungeecore/listeners/TablistManager.java	2022-06-14 08:28:10 +02:00
Lixfel	d05af2258b	Fix translation ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-13 22:38:09 +02:00
Lixfel	0446af29aa	Cannot spoof chat my ass ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-13 22:10:10 +02:00
yoyosource	3a97baa267	Add debug messages for fabric checks	2022-06-12 18:22:33 +02:00
yoyosource	8267966409	Merge remote-tracking branch 'origin/master'	2022-06-12 18:17:51 +02:00
yoyosource	3d57f9ca80	Add debug messages for fabric checks	2022-06-12 18:17:44 +02:00
Chaoscaot	e49546d3d8	Fix Remote Plugin Messages	2022-06-11 09:44:39 +02:00
Chaoscaot	a97a6a78e2	Fix Remote Plugin Messages	2022-06-11 08:55:51 +02:00
Lixfel	01ea928652	1.19 Build server ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-10 19:30:15 +02:00
Lixfel	c5ae7fd229	Merge branch 'master' into ConvertFromWaterfall	2022-06-08 16:53:01 +02:00
Lixfel	2f06ea374e	Simplify connection detection ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-08 16:18:04 +02:00
yoyosource	6769fd88e7	Fix TablistManager	2022-06-08 16:06:31 +02:00
yoyosource	bad4efd520	Convert everything from waterfall to plain bungee	2022-06-08 13:28:56 +02:00
yoyosource	9439887785	Fix TablistManager for newer BTLP plugin	2022-06-08 13:18:24 +02:00
yoyosource	27750d4e71	Merge remote-tracking branch 'origin/master'	2022-06-07 22:38:29 +02:00
yoyosource	1a91e561fa	Disable SWTSI for now	2022-06-07 22:38:08 +02:00
Chaoscaot	446b4ad519	Bungee Network	2022-06-07 20:53:09 +02:00
Lixfel	59672e8d02	Merge pull request 'Using sql connections in round robbin mode instead of the same (possibly)' (#361) from sql into master ... Reviewed-on: #361 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-06-07 14:14:21 +02:00
Lixfel	c74b2b2c84	Fix settings changed npe ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-07 14:13:51 +02:00
Lixfel	9f7f5eef36	Test fix ban timeout ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-04 22:49:07 +02:00
Lixfel	6d0a1f6bfd	Fix geyser floodgate null ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-06-04 16:23:13 +02:00
YoyoNow	dea8e0b731	Merge branch 'master' into sql	2022-06-03 22:25:37 +02:00
yoyosource	d4e2e80dd5	Hotfix WhoisCommand	2022-06-03 13:26:03 +02:00
yoyosource	edfbfb614d	Hotfix WhoisCommand	2022-06-03 13:24:47 +02:00
yoyosource	bb68a4a690	Using sql connections in round robbin mode instead of the same (possibly)	2022-06-02 17:08:29 +02:00
yoyosource	163e40f2dd	Fix ErrorLogger	2022-05-30 15:35:51 +02:00
yoyosource	2fb2fbc781	Add arg to replay command for direct selection of map	2022-05-30 11:31:15 +02:00
yoyosource	cb5f78a7de	Fix ChatListener MSG_FORMAT missing	2022-05-29 14:54:58 +02:00
yoyosource	86530eacf5	Fix TeamCommand better message	2022-05-28 13:32:12 +02:00
yoyosource	300a2ef502	Fix TeamCommand tp no message	2022-05-28 13:29:18 +02:00
yoyosource	f45ed11a59	Fix TeamCommand tp no message	2022-05-28 13:17:53 +02:00
yoyosource	1b61ba93e9	Fix TeamCommand tp no message	2022-05-28 13:12:31 +02:00
yoyosource	c7f16247ca	Fix TeamCommand tp no message	2022-05-28 13:08:50 +02:00
yoyosource	caa36b9461	Fix SettingsChangedListener error message	2022-05-28 12:57:51 +02:00
yoyosource	61b264ffcd	Merge remote-tracking branch 'origin/master'	2022-05-24 21:41:08 +02:00
yoyosource	d06a0a9c12	Fix TablistManager ... Fix ListCommand	2022-05-24 21:40:58 +02:00
yoyosource	63b6450ae8	Fix localhost connections	2022-05-24 20:04:35 +02:00
yoyosource	b3d16a1279	Fix localhost connections	2022-05-24 19:45:20 +02:00
yoyosource	29b2aee2f1	Fix TablistManager footer	2022-05-24 10:28:04 +02:00
yoyosource	5ba2a235c0	Fix TablistManager footer	2022-05-24 10:27:10 +02:00
Lixfel	f9a5a75442	Merge branch 'master' into english	2022-05-24 10:11:46 +02:00
Lixfel	e64e3c09ff	Various language fixes ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-24 10:11:10 +02:00
Lixfel	cfd72d099d	Fix NPE ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-24 09:03:31 +02:00
yoyosource	d5c6c7892e	Improve TpCommand for current checking players	2022-05-23 17:56:15 +02:00
yoyosource	4f6bb722ad	Fix stuff	2022-05-21 16:30:41 +02:00
yoyosource	5a129c6037	Fix SteamwarUser	2022-05-21 13:25:07 +02:00
yoyosource	8aed828f82	Add SettingsChangedListener	2022-05-21 13:04:30 +02:00
yoyosource	1204a5ccda	Update translations	2022-05-21 12:54:59 +02:00
yoyosource	df310716d8	Update language stuff	2022-05-21 12:48:03 +02:00
yoyosource	9445ed5f05	Fix initial english	2022-05-21 12:31:26 +02:00
yoyosource	2098cc9515	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	b95ae4cecc	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	081a0a2e3a	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	fdbab764d3	Add initial english	2022-05-21 12:31:26 +02:00
yoyosource	1847ba8f89	Fix command	2022-05-21 11:09:01 +02:00
yoyosource	df24f2685a	Add locale locking	2022-05-21 11:06:24 +02:00
yoyosource	092efd7063	Add locale locking	2022-05-21 11:00:08 +02:00
Lixfel	348aabc99a	Fix ban message showing ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-05-18 16:47:38 +02:00
yoyosource	1dedebb3aa	Fix BungeeCore.properties	2022-05-02 13:58:45 +02:00
Lixfel	0a5c89b8b7	Merge pull request 'Arena Merging 2.0' (#329) from arena_merging_2.0 into master ... Reviewed-on: #329 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:45:03 +02:00
Lixfel	cd15787ae1	Merge pull request 'Add some new punishments after talking with mods' (#352) from Punishment++ into master ... Reviewed-on: #352 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-05-01 22:20:01 +02:00
yoyosource	d1e90d8a6c	Speed BrandListener up	2022-04-27 10:08:54 +02:00
yoyosource	d4a50d3974	Speed BrandListener up	2022-04-27 10:06:44 +02:00
yoyosource	07da2c56a3	Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/de/steamwar/bungeecore/listeners/BrandListener.java	2022-04-27 09:59:21 +02:00
yoyosource	6e158b38b8	Speed BrandListener up	2022-04-27 09:58:15 +02:00
Lixfel	d6c82e923f	Speed BrandListener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-26 19:58:41 +02:00
yoyosource	93dcb0d202	Revert "Update stuff" ... This reverts commit f61fcde5c9.	2022-04-26 19:25:32 +02:00
yoyosource	aaf389ea4c	Merge remote-tracking branch 'origin/Punishment++' into Punishment++	2022-04-26 18:18:34 +02:00
yoyosource	f61fcde5c9	Update stuff	2022-04-26 18:18:27 +02:00
YoyoNow	d0bbdd903b	Merge branch 'master' into Punishment++	2022-04-26 15:26:00 +02:00
yoyosource	9a28173496	Update stuff	2022-04-26 15:21:44 +02:00
yoyosource	cc86aa16a0	Update stuff	2022-04-26 15:21:09 +02:00
yoyosource	2ef6901f8e	Update WhoisCommand ... Add mutlie note punishments	2022-04-25 11:09:08 +02:00
Lixfel	50ac0ddc55	Speed Brandlistener up ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-04-24 17:54:06 +02:00
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
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