Archiviert
1
0
Commit graph

801 Commits

Autor SHA1 Nachricht Datum
yoyosource
64c8af3064 Fix TablistManager 2021-06-28 17:27:29 +02:00
yoyosource
5637311be5 Hotfix Tablist 2021-06-28 17:06:00 +02:00
yoyosource
906be50771 Compress ChatListener.onPlusMessage 2021-06-27 08:10:15 +02:00
Chaoscaot
955cb8863a Remove Debug 2021-06-26 11:14:13 +02:00
Chaoscaot
c750231b14 Add + to Local Chat 2021-06-26 11:13:01 +02:00
yoyosource
ca281f5ef9 Merge remote-tracking branch 'origin/ListCommand' into ListCommand 2021-06-26 10:28:05 +02:00
yoyosource
c253709f4a Update ListCommand to multilang 2021-06-26 10:27:59 +02:00
7a77ea0816 Merge branch 'master' into ListCommand 2021-06-26 10:24:14 +02:00
yoyosource
ad054d2b06 Remove ListCommand 2021-06-26 10:23:44 +02:00
yoyosource
e9297fab47 Add ListCommand 2021-06-26 10:22:55 +02:00
yoyosource
fa70a46b64 Remove useless checks 2021-06-26 08:09:23 +02:00
f1f13da3d1 Merge branch 'master' into StatCommand 2021-06-26 08:07:23 +02:00
e9bbc559c5 Merge branch 'master' into SlimTeamMemberTab 2021-06-26 08:06:31 +02:00
yoyosource
c925aa41ac Fix SubserverSystem concurrency and Thread safety 2021-06-25 18:28:21 +02:00
yoyosource
9e8a031230 Make Fight Server with one Player more visible 2021-06-25 17:48:47 +02:00
yoyosource
11f61f34cd Fix TablistManager 2021-06-25 16:41:43 +02:00
yoyosource
1c9bd9fcff Fix TablistManager 2021-06-25 16:37:30 +02:00
yoyosource
4a94f453f6 Add ListCommand for user 2021-06-25 15:48:11 +02:00
yoyosource
71c206e59c Update TablistManager 2021-06-25 15:41:26 +02:00
yoyosource
edbaddbee6 Update TablistManager 2021-06-25 15:31:29 +02:00
yoyosource
f2ba19da71 Fix TablistManager add Team visibility 2021-06-25 12:33:07 +02:00
yoyosource
80ec27b0c4 Fix TablistManager add Team visibility 2021-06-25 11:49:59 +02:00
yoyosource
d11b4ba9ca Fix TablistManager add Team visibility 2021-06-25 10:47:17 +02:00
09214a0212 Merge pull request 'Better Tablist footer' (#215) from BetterTablistFooter into master
Reviewed-on: SteamWar/BungeeCore#215
Reviewed-by: Zeanon <thezeanon@gmail.com>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-06-25 07:19:49 +02:00
yoyosource
70359e1c9e Fix CPU usage threshold 2021-06-24 19:42:54 +02:00
yoyosource
8705e19aec Update Tablist slim Mode! 2021-06-24 17:41:05 +02:00
yoyosource
66899e8df1 Update Tablist slim Mode! 2021-06-22 12:21:50 +02:00
yoyosource
0769057d8f Merge branch 'master' into BetterTablistFooter 2021-06-22 11:17:23 +02:00
yoyosource
ed10fbd786 Add Node3 2021-06-21 22:07:38 +02:00
yoyosource
2fc19bc92d Add Node3 2021-06-21 22:02:53 +02:00
yoyosource
4de062176a Better Tablist footer 2021-06-21 16:52:39 +02:00
yoyosource
5d34cf323f Fix LoadEvaluation 2021-06-20 21:40:41 +02:00
yoyosource
5959f8eb6f Add StatCommand
Fix LoadEvaluation
2021-06-20 21:38:45 +02:00
yoyosource
4120e989ce Add StatCommand
Fix LoadEvaluation
2021-06-20 21:38:12 +02:00
yoyosource
f6a4c343a5 Add StatCommand
Fix LoadEvaluation
2021-06-20 21:36:58 +02:00
yoyosource
5aa973d388 Fix LoadEvaluation 2021-06-20 19:02:05 +02:00
yoyosource
85e129ada6 Fix LoadEvaluation
Fix naming
2021-06-20 18:03:41 +02:00
72ee7c19c8 Untested remote start system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-06-20 17:46:13 +02:00
f8618a7a82 Remove bau passthrough
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-05-29 17:39:06 +02:00
0e0a3606ce Hotfix team deletion
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-05-28 16:48:29 +02:00
5715ea391c Fix disbanding teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-05-24 09:37:14 +02:00
d1cb167039 now currentServer != null 2021-05-18 19:31:49 +02:00
c0366c4daa optimized imports 2021-05-18 19:30:09 +02:00
9874ab204e No changes on Persistent Bungeecore nescessary 2021-05-18 19:26:32 +02:00
fca4f736e8 readability 2021-05-18 18:11:56 +02:00
41a8ea316f me stupid 2021-05-18 18:10:25 +02:00
d1b901be69 codestyle 2021-05-18 18:09:34 +02:00
83bcdd34bf rework in persistent bungeecore for said issue 2021-05-18 18:08:25 +02:00
ac08d7390b See Security-Breach issue 2021-05-15 19:29:56 +02:00
Chaoscaot
8567f920c4 Fix BrandListener 2021-05-10 22:18:59 +02:00
588ecebb3f Merge branch 'master' into schem_aleart 2021-05-09 07:48:09 +02:00
b3594f7c4e Merge pull request 'Add custom Branding for Bungee' (#203) from custom_brand into master
Reviewed-on: SteamWar/BungeeCore#203
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-05-09 07:47:46 +02:00
Chaoscaot
a0f87e4916 Fix Params 2021-04-28 12:28:10 +02:00
Chaoscaot
ead209af0a Reduce Brand Info 2021-04-28 12:27:32 +02:00
Chaoscaot
ea9a98ec11 Add custom Branding for Bungee 2021-04-27 14:49:28 +02:00
c7402b34ee You can now ban and mute Users who never joined the server, HOOZAH 2021-04-26 20:24:56 +02:00
956339faf6 Hotfix team creation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-23 18:44:38 +02:00
a2c44718ff Merge pull request 'Fixed Empty Team' (#200) from Empty_Team_Fix into master
Reviewed-on: SteamWar/BungeeCore#200
Reviewed-by: Zeanon <thezeanon@gmail.com>
2021-04-15 19:26:18 +02:00
zOnlyKroks
93d463365a Fixed Empty Team 2021-04-15 18:54:21 +02:00
3676051e40 Allow paper bau + small code cleanup
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-14 20:24:35 +02:00
Chaoscaot
0ea0cf1b3f Merge branch 'master' into schem_aleart
# Conflicts:
#	src/de/steamwar/bungeecore/Message.java
#	src/de/steamwar/messages/BungeeCore.properties
2021-04-14 19:26:19 +02:00
3a23ab5f36 Merge pull request 'Fixed Team Leader is Member' (#198) from Team_Leader_Fix into master
Reviewed-on: SteamWar/BungeeCore#198
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-14 14:24:22 +02:00
zOnlyKroks
2a16c8c66b Fixed Team Leader is Member 2021-04-14 14:23:06 +02:00
Chaoscaot
3ec2e103b5 Fixed Schem Alert 2021-04-13 14:53:41 +02:00
5559970552 Fix msgs
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-13 07:37:31 +02:00
073ed4c436 Fix msgs
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-13 07:32:27 +02:00
f59350bab7 Fix leader
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-13 07:25:32 +02:00
zOnlyKroks
dc49ddff4d Fixed team remove command 2021-04-13 07:22:57 +02:00
zOnlyKroks
2bbcb283b4 Used Lambda 2021-04-12 12:33:10 +02:00
zOnlyKroks
bc39e6f307 Fixed Formating of Code 2021-04-12 12:32:05 +02:00
zOnlyKroks
f3a6269331 Added Multi Leader Feature 2021-04-11 15:45:35 +02:00
fc20d9c671 Merge pull request 'Improve @Ping a lot' (#195) from new_@ping into master
Reviewed-on: SteamWar/BungeeCore#195
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-04-10 18:38:09 +02:00
Chaoscaot
d0422fc453 Remove Unused Import 2021-04-04 18:36:24 +02:00
Chaoscaot
1773d3df66 Improve @Ping a lot 2021-04-04 18:35:28 +02:00
yoyosource
d5648d9d0b Remove BungeeCore.properties BAU_HELP MESSAGE 2021-04-04 18:09:21 +02:00
yoyosource
74c1d2feac Merge branch 'master' into Permission
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BauCommand.java
2021-04-04 17:55:29 +02:00
yoyosource
56b6e9d94b Remove BauweltMember.build 2021-04-04 17:52:13 +02:00
29c5dc3407 Fix wait for termination
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-04-03 09:06:00 +02:00
0dcb831142 Fix missing config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 20:03:56 +02:00
1824dda857 Fix license header
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:48:51 +02:00
4c2f4fdbcd Implement prepare
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:47:34 +02:00
5ee46a2ca3 Adjust config for new fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:13:35 +02:00
5424a739d9 Adjust config for new fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:12:00 +02:00
a079b25c14 Adjust config for new fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-30 19:08:09 +02:00
Chaoscaot
3ea273767d Add Static Server Fabric Check 2021-03-04 21:14:19 +01:00
Chaoscaot
4496cd8b0a Changing to Schemnodes 2021-03-04 03:06:34 +01:00
b5b6a624c6 Test git hooks
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-02 07:23:07 +01:00
c795692e79 Event deadline
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-03-01 20:53:32 +01:00
Chaoscaot
b3bf45846a Fix Error in Team Invite Message 2021-02-20 22:51:02 +01:00
Chaoscaot
916d228fac Fix Change Leader Message 2021-02-14 00:09:24 +01:00
Chaoscaot
8a2d5f315f Expanding Some Things 2021-02-13 00:53:09 +01:00
Chaoscaot
f6a6177185 Fixing Various thing with new Message System 2021-02-11 17:02:24 +01:00
Chaoscaot
2a9a36d53e Fixed UNKNOWN_TEAM Message 2021-02-05 14:28:21 +01:00
Chaoscaot
a9982de3db Fixed Wrong Message 2021-02-05 13:53:14 +01:00
fa60eeb121 Test ttl
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-05 13:25:46 +01:00
e9b8940de0 Merge pull request 'Reloadable Resource Bundle' (#178) from moreML into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-05 12:49:03 +01:00
Chaoscaot
6f6327d60f Add ResourcereloadCommand 2021-02-05 12:29:41 +01:00
Chaoscaot
9ad9a2c835 Add ResourcereloadCommand 2021-02-05 12:28:35 +01:00
Chaoscaot
e661d876b1 Temp Tp Fix 2021-02-05 12:04:06 +01:00
2c55a89bbb Merge pull request 'Fix MsgCommand and RCommand' (#176) from moreML into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-05 11:57:02 +01:00
Chaoscaot
d7b784c03c Fix Team List 2021-02-05 11:55:20 +01:00
Chaoscaot
30cd8c2c7c Fix Bau Allowed Message 2021-02-05 11:49:45 +01:00
Chaoscaot
8114bb2922 Fix Bau Add Message 2021-02-05 11:48:37 +01:00
Chaoscaot
61ce5cd860 Fix MsgCommand and RCommand 2021-02-05 11:45:21 +01:00
b7fed24475 Merge pull request 'moreML' (#175) from moreML into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-05 11:36:27 +01:00
Chaoscaot
cfbf1c0850 Fix Fight & Hover Messages 2021-02-05 11:34:55 +01:00
Chaoscaot
5cac4af7a4 Fix ChallengeCommand 2021-02-05 11:32:46 +01:00
7bc1751ed7 Merge pull request 'Message Fixing' (#174) from moreML into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-05 11:30:01 +01:00
Chaoscaot
11c55d9419 Fix JoinmeCommand 2021-02-05 11:29:34 +01:00
Chaoscaot
7e9cc37e2d Fix Team and ServerTeamchatCommand 2021-02-05 11:25:33 +01:00
Chaoscaot
a840671ced Fix Challenge Broadcast 2021-02-05 11:23:57 +01:00
Chaoscaot
02e4398301 Fix Join not Found 2021-02-05 11:22:48 +01:00
cd7ee79cdc Remove debug messages
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-05 07:55:22 +01:00
18cb65a28b Fix tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-05 07:54:39 +01:00
e1cd7b9c52 Fix team event overview
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-05 07:38:56 +01:00
4fb3411842 Merge pull request 'More MultiLang' (#169) from moreML into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-02-05 07:30:51 +01:00
Chaoscaot
575ef6fb08 Fix of Perma ban on Avoiding Alert 2021-02-02 23:42:00 +01:00
5d35e08af5 Hotfix ban system
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-02-01 18:42:54 +01:00
a323661bc9 Remove spam
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-30 17:11:27 +01:00
Chaoscaot
d8d4d2d04b Fix Merge Confilcts 2021-01-30 11:17:37 +01:00
Chaoscaot
611074fa0b Merge branch 'master' into moreML
# Conflicts:
#	src/de/steamwar/bungeecore/BungeeCore.java
#	src/de/steamwar/bungeecore/commands/UnbanCommand.java
#	src/de/steamwar/messages/BungeeCore.properties
2021-01-30 11:15:27 +01:00
ae7dc04fd5 Merge pull request 'Ban System Rework' (#150) from ban-rework into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2021-01-30 08:42:33 +01:00
Chaoscaot
47aed8ab81 Fix Colorscheme 2021-01-29 20:53:54 +01:00
Chaoscaot
46efab09c2 Fix Colorscheme 2021-01-29 20:51:35 +01:00
Chaoscaot
42adba4adc Add Check if user is Banned in Unban Command 2021-01-28 20:14:05 +01:00
Chaoscaot
f0eed3e94e Fix Typo 2021-01-27 12:09:47 +01:00
Chaoscaot
b7aa3d3d8b Remove Unused Method 2021-01-27 12:07:03 +01:00
Chaoscaot
99aab1bd17 Fixing Typos and Messages 2021-01-27 12:03:52 +01:00
812b0a73b7 May the spam begin
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-27 10:31:14 +01:00
Chaoscaot
df5b40020a Fixing Typo 2021-01-22 16:42:15 +01:00
Chaoscaot
d2db4af4eb Remove Empty Line 2021-01-22 16:31:21 +01:00
Chaoscaot
d0fdeea038 Syntax to Usage 2021-01-22 13:55:03 +01:00
Chaoscaot
7f802c7a8a Minor Changes 2021-01-22 11:02:40 +01:00
Chaoscaot
bef39c7cc2 Fixing... 2021-01-22 10:41:57 +01:00
Chaoscaot
64d115bd30 Add SubserverSystem MultiLang 2021-01-19 20:19:10 +01:00
Chaoscaot
93d1249713 Add SubserverSystem MultiLang 2021-01-19 20:18:14 +01:00
Chaoscaot
7f54c75ae4 Add EventStarter MultiLang 2021-01-19 17:51:48 +01:00
Chaoscaot
6bd9cd6fdd Add TablistManager MultiLang 2021-01-19 17:39:51 +01:00
Chaoscaot
1b69057eea Add PollSystem MultiLang 2021-01-19 16:38:30 +01:00
Chaoscaot
11a339f785 Add EventModeListener MultiLang 2021-01-19 16:26:59 +01:00
Chaoscaot
fa9f4f7e79 Add ConnectionListener MultiLang 2021-01-19 16:25:03 +01:00
Chaoscaot
85bc8aa3ec Add CheckListener MultiLang 2021-01-19 16:19:32 +01:00
Chaoscaot
6b469b6da1 Add ChatListener MultiLang 2021-01-19 16:16:37 +01:00
Chaoscaot
31eff322ab Add WebregisterCommand MultiLang 2021-01-19 15:17:09 +01:00
Chaoscaot
327f09d85e Add UnIgnoreCommand MultiLang 2021-01-19 15:12:10 +01:00
Chaoscaot
8cdcac7371 Add UnbanCommand MultiLang 2021-01-19 15:09:30 +01:00
Chaoscaot
88ac5a7281 Add TpCommand MultiLang 2021-01-19 15:07:34 +01:00
Chaoscaot
d20efc1a2f Add TeamCommand MultiLang 2021-01-19 15:03:23 +01:00
Chaoscaot
c0ff508f3d Add First part of TeamCommand MultiLang 2021-01-19 02:39:05 +01:00
Chaoscaot
d470a56ffa Add TeamchatCommand MultiLang 2021-01-19 01:58:25 +01:00
Chaoscaot
0d6eecbbd4 Add ServerTeamchatCommand MultiLang 2021-01-19 01:54:50 +01:00
Chaoscaot
c15f4a8e62 Add RegelnCommand MultiLang 2021-01-19 01:51:36 +01:00
Chaoscaot
5098bf8282 Add RCommand MultiLang 2021-01-19 01:41:00 +01:00
Chaoscaot
33c45dd3f2 Add RankedCommand MultiLang & Multiple Bug Fixes 2021-01-19 01:37:01 +01:00
Chaoscaot
f80829fc46 Add RankCommand MultiLang 2021-01-19 01:24:19 +01:00
Chaoscaot
25885bd65c Add PollCommand MultiLang 2021-01-19 01:20:22 +01:00
Chaoscaot
34a4030f80 Add PingCommand MultiLang 2021-01-19 01:17:28 +01:00
Chaoscaot
417902f49d Add MsgCommand MultiLang 2021-01-19 01:16:15 +01:00
Chaoscaot
67fb884bc1 Add KickCommand MultiLang 2021-01-19 01:09:32 +01:00
Chaoscaot
85d5a76e30 Add JoinmeCommand MultiLang 2021-01-19 01:06:33 +01:00
Chaoscaot
0dbbea3558 Optimizing Stuff 2021-01-18 23:35:50 +01:00
Chaoscaot
2b96c1fbc6 Add HistoricCommand ML & Optimize Imports 2021-01-18 23:23:48 +01:00
Chaoscaot
e74fa6765b Add FightCommand ML 2021-01-18 23:15:44 +01:00
Chaoscaot
5d23d36897 Add EventRescheduleCommand ML 2021-01-18 22:36:24 +01:00
Chaoscaot
1b77a53c85 Add EventCommand ML 2021-01-18 21:38:28 +01:00
Chaoscaot
8dc4bd5f61 Add ChallengeCommand ML 2021-01-18 20:49:24 +01:00
Chaoscaot
a4359b6dd5 Add BauCommand ML 2021-01-18 20:04:30 +01:00
Chaoscaot
cac7b66208 Remove Unused Import 2021-01-18 03:18:36 +01:00
Chaoscaot
45e97702ca Fix Message Name 2021-01-18 03:18:19 +01:00
Chaoscaot
4a5ccc0bbf Remove Unused Method 2021-01-18 03:17:13 +01:00
Chaoscaot
898a948512 Fixing Whois 2021-01-16 19:47:21 +01:00
Chaoscaot
9970266d90 Fix Ban Changed 2021-01-16 18:36:19 +01:00
Chaoscaot
f99b10ade2 Fix NPE 2021-01-16 16:41:34 +01:00
Chaoscaot
0d643d618a Add ML to Mod Autoban 2021-01-16 13:50:34 +01:00
Chaoscaot
e0222982cb Fixing some Things 2021-01-16 13:38:47 +01:00
Chaoscaot
61057204c3 Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/bungeecore/Message.java
2021-01-16 13:03:16 +01:00
Chaoscaot
e76c79c8d8 Add Some Refactoring and enabling Doublelayer Messages 2021-01-15 19:29:44 +01:00
0a472091ba Hotfix testarena
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-14 21:10:24 +01:00
1ac51e54e1 Green color online teammembers
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-04 18:42:48 +01:00
Chaoscaot
0234e0d2e0 Add Hover to Check Reminder and Reminder on Connection 2021-01-03 15:18:00 +01:00
076a7d9bf2 Work around new forge mod loader
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-01-02 17:23:37 +01:00
Chaoscaot
e0d158b152 Fix Color 2021-01-01 13:30:13 +01:00
Chaoscaot
0ef5f6dcb9 Fixing Stuff... 2021-01-01 02:15:12 +01:00
Chaoscaot
8128d44011 Imports... 2020-12-30 17:12:28 +01:00
Chaoscaot
fec517f5a1 WIP 2020-12-30 13:28:09 +01:00
Chaoscaot
5fb8a617a7 Merge branch 'master' into ban-rework 2020-12-30 12:56:17 +01:00
Chaoscaot
633ff8c44d Merge remote-tracking branch 'origin/ban-rework' into ban-rework
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-12-30 12:56:08 +01:00
Chaoscaot
4d752e033c Fixing 2020-12-29 14:47:58 +01:00
Chaoscaot
69e8a4e24f Using more of Color 2020-12-29 01:38:47 +01:00
Chaoscaot
a2169ec3e1 Fixing 2020-12-28 19:16:51 +01:00
Chaoscaot
065ab72625 Improve Color List 2020-12-28 17:54:24 +01:00
Chaoscaot
14479271cd Optimize Imports 2020-12-28 17:38:26 +01:00
Chaoscaot
d86122a278 Fixing old Dependencies 2020-12-28 17:37:38 +01:00
Chaoscaot
7d67c7615b Add Teamcolor 2020-12-28 17:33:24 +01:00
e5dd2a69ad Hotfix check
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-20 17:22:55 +01:00
03a0ed8898 Hotfix check
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-20 14:05:39 +01:00
f0c2fad218 Hotfix check list
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-20 14:02:24 +01:00
0e31a6cd90 Hotfix check list
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-20 13:55:50 +01:00
jojo
823fabec16 Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-12-19 17:29:33 +01:00
f431fa7147 Test bundle clear
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 14:31:41 +01:00
3c4c10288f Test bundle clear
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 14:29:20 +01:00
82d350f3ee Test bundle clear
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 14:25:34 +01:00
31f325421a Check refactoring: Using Message, informing about previous checks
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 14:12:19 +01:00
bf0bd042a8 Fix bbc
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 12:36:05 +01:00
39d81f7e86 Merge pull request 'Extending AntiWDL capabilities' (#162) from wdl into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-12-19 12:27:03 +01:00
49ed45a346 Extending AntiWDL capabilities
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 12:21:26 +01:00
a5dc11cac1 Fix bannumgehungs timings
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-19 12:08:18 +01:00
adf0d6b716 Merge pull request 'Extraced Inventory API Changes from BungeeSchemGUI' (#156) from switem-api into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-15 19:42:04 +01:00
Chaoscaot
b634b8adf0 Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-12-11 23:05:36 +01:00
Chaoscaot
95b5925b5f Fixing Message Again... 2020-12-10 19:35:43 +01:00
Chaoscaot
c0330635a6 Fixing Message 2020-12-10 19:31:28 +01:00
Chaoscaot
68ce7330ef Fixing Double Execution of Code 2020-12-10 19:18:50 +01:00
Chaoscaot
dcff5ed22f Add Extending Ban of Account with same IP 2020-12-10 15:17:25 +01:00
Chaoscaot
ed79088560 Add Ban Time to Banumgehungs message and moved Messages to properties 2020-12-10 15:00:48 +01:00
518ba7bd35 Hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-12-09 07:11:20 +01:00
Chaoscaot
9a3756f3d0 Extraced Inventory API Changes from BungeeSchemGUI 2020-12-08 17:09:19 +01:00
cacc2f158a Merge pull request 'rework-BauServerHelp' (#152) from rework-BauServerHelp into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-12-07 21:06:17 +01:00
Chaoscaot
3e31128dc3 Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BanCommand.java
#	src/de/steamwar/bungeecore/commands/MuteCommand.java
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-28 11:30:06 +01:00
jojo
56edd5c360 Optimize Imports 2020-11-28 08:24:58 +01:00
jojo
e6926116fb Optimize Imports 2020-11-28 08:06:36 +01:00
Chaoscaot
3035459c6a Merge branch 'master' into ban-rework
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-28 02:03:43 +01:00
8caf77d576 Fix additional typo
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-27 23:55:40 +01:00
f5c834df11 Fix typo
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-27 23:53:06 +01:00
b3fbce3c2b Merge branch 'master' into moreMultiLingual
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-27 23:50:09 +01:00
jojo
ad2d48ccde Merge branch 'master' into rework-BauServerHelp
# Conflicts:
#	src/de/steamwar/messages/BungeeCore.properties
2020-11-27 20:03:45 +01:00
feb0b36d61 Merge pull request 'Add PollResult Command' (#153) from pollresult into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-27 17:11:53 +01:00
Chaoscaot
71ad90ea2f Fixing Error Logging 2020-11-27 15:17:31 +01:00
Chaoscaot
06d18866b6 Add Multilang 2020-11-24 16:38:47 +01:00
Chaoscaot
842c6e046c Changing Messages 2020-11-23 18:58:32 +01:00
Chaoscaot
01f40b9440 Changing Messages 2020-11-23 18:26:04 +01:00
d9f1617235 Fix chat-msgs
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-22 08:49:54 +01:00
jojo
56b01d6ee6 Update Messages
Update HelpCommand
2020-11-20 09:53:43 +01:00
Chaoscaot
a3179483fd Changing Messages 2020-11-20 09:45:33 +01:00
Chaoscaot
8682bb9b66 Add PollResult Command 2020-11-20 01:06:47 +01:00
jojo
6c68aab3dd Fix HelpCommand 2020-11-19 22:35:19 +01:00
jojo
4ba2b56d19 Update '/help bau' 2020-11-19 22:03:50 +01:00
jojo
730b56e4ec Add /mute Multilingual support
Update properties
2020-11-19 17:20:01 +01:00
Chaoscaot
2d9f686ba8 Update Message Mute 2020-11-19 17:14:56 +01:00
Chaoscaot
293b037ffd Update Message 2020-11-19 17:13:02 +01:00
Chaoscaot
63ce857c45 Add MoreMultilingualTransfer 2020-11-18 14:23:46 +01:00
Chaoscaot
814c2f851d Merge branch 'moreMultiLingual' into ban-rework
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BanCommand.java
2020-11-18 14:07:53 +01:00
Chaoscaot
3cb5eac639 Fixing Everything 2020-11-18 14:03:52 +01:00
Chaoscaot
4137ebb61b Fixing... 2020-11-16 15:47:28 +01:00
Chaoscaot
cfb12dfb75 Fixing Ban extended 2020-11-15 20:45:34 +01:00
Chaoscaot
aa73889ffe Fixing BannedUserIp Delete 2020-11-15 13:04:53 +01:00
Chaoscaot
5ee2d10308 Fixing BannedUserIp Delete 2020-11-15 13:04:31 +01:00
Chaoscaot
4dd593243e Fixing Recursive SQL Select 2020-11-15 12:23:44 +01:00
Chaoscaot
6607b736ee Fixing... 2020-11-15 11:02:23 +01:00
Chaoscaot
f20be78c59 Announce Bans and Mutes 2020-11-14 23:31:11 +01:00
Chaoscaot
2c026a1d21 Imports... 2020-11-14 23:25:39 +01:00
Chaoscaot
986b53fbf8 Reworked Ban and Mute 2020-11-14 23:23:49 +01:00
8c3df0e1dd Fix server order
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-06 13:41:05 +01:00
994f758d7c Merge pull request 'Added LiteLoader Blocking' (#144) from liteloader into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-11-01 19:02:10 +01:00
89d57e3f48 More multilingual transfer
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-01 18:26:21 +01:00
Chaoscaot
6b589ec5de LiteLoader 2020-11-01 09:38:16 +01:00
Chaoscaot
2f257929a8 LiteLoader 2020-10-31 11:11:11 +01:00
ff1c72233b Merge pull request 'Rework of the Codesite Group System' (#139) from change-color into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-31 10:47:42 +01:00
ad811d829c Merge pull request 'Remove PUB (Öffentlich) team from /team info after /softreload' (#145) from TeamInfo into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-31 10:44:12 +01:00
Chaoscaot
12e27ca6c0 Changed YouTube Name 2020-10-30 23:13:10 +01:00
Chaoscaot
bffb3f6c99 LireLoader 2020-10-30 23:05:49 +01:00
Chaoscaot
5d5df4ed2a Changed Supporter Color to &9 2020-10-30 22:40:57 +01:00
Chaoscaot
edd81c6ca6 Add Chatcolor to UserGroup 2020-10-30 22:34:29 +01:00
jojo
e46c608e4c Remove PUB (Öffentlich) team from /team info after /softreload 2020-10-30 22:33:44 +01:00
Chaoscaot
f1bac4c9d2 Merge branch 'master' into change-color 2020-10-30 22:17:05 +01:00
Chaoscaot
915c8d1d25 Fixing... 2020-10-30 22:16:55 +01:00
Chaoscaot
f411bc5d77 Merge branch 'master' into liteloader
# Conflicts:
#	src/de/steamwar/bungeecore/commands/FightCommand.java
2020-10-30 22:12:37 +01:00
Chaoscaot
7893d7a691 Added LiteLoader Blocking 2020-10-30 22:11:27 +01:00
a74af339aa Merge branch 'master' into eventMode
# Conflicts:
#	src/de/steamwar/bungeecore/SubserverSystem.java
2020-10-30 21:53:25 +01:00
Chaoscaot
be1aa30cd3 Removed Ban Limiting 2020-10-30 21:46:20 +01:00
Chaoscaot
349e67ed5c Refactored Ban Command to only allow downwards bans 2020-10-30 19:45:16 +01:00
Chaoscaot
6483729608 Refactored UserGroup 2020-10-30 17:08:17 +01:00
Chaoscaot
caeb47b3d2 Merge branch 'master' into change-color 2020-10-30 16:06:14 +01:00
84c2c2f825 Fix port clash
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 15:16:34 +01:00
f39b7787d9 Implementing event mode for event bungee
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 14:49:45 +01:00
b63b5f021c Shorten name for ranked matches
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 08:03:11 +01:00
f721cfaed6 Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 07:33:50 +01:00
c2f3ab8094 Fix errors in impl.
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 20:54:25 +01:00
055aaa2aca Untested tablist name handling
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 12:06:12 +01:00
Chaoscaot
5913ee5f42 Changed Color of Mods. and Supps. 2020-10-28 22:35:08 +01:00
Chaoscaot
02d1845582 Unified Color and Groups for Tablist and Chat 2020-10-28 19:26:18 +01:00
790d37300e Merge pull request 'Fixed Fabric not Allowed on Testarena' (#138) from fixed-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-27 15:29:43 +01:00
Chaoscaot
bf895903f8 Fixing... 2020-10-24 19:20:31 +02:00
jojo
23cd9b2334 Remove PUB (Öffentlich) team from /team info after /softreload 2020-10-24 19:01:03 +02:00
81ece47bb3 Merge pull request 'Remove duplicate E-Mail exception in database' (#136) from DuplicateEMail into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-24 15:19:43 +02:00
746bf6db08 Merge pull request 'Allow HH:mm on /ban and /mute' (#132) from ban-time-update into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
2020-10-24 15:19:24 +02:00
jojo
b6973b73f7 Remove duplicate E-Mail exception in database 2020-10-24 14:52:14 +02:00
jojo
67695b6ce3 Fix Leader remove on /team 2020-10-24 13:14:53 +02:00
Chaoscaot
25ed4e7f00 Fixing... 2020-10-20 22:16:47 +02:00
Chaoscaot
a959b20370 Fixing... 2020-10-20 22:10:57 +02:00
Chaoscaot
c3ff72373b Fixing... 2020-10-20 22:08:08 +02:00
Chaoscaot
50770242a7 Fixed Badlion not Disabling Mods 2020-10-18 16:07:48 +02:00
Chaoscaot
38f90d025a Allow HH:mm on /ban and /mute 2020-10-18 00:50:18 +02:00
131134b8b8 Removing Developer exception
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-15 21:15:54 +02:00
Chaoscaot
05c0bfac58 Fixed Language 2020-10-12 13:20:31 +02:00
Chaoscaot
2911721cba Add Fabric Challenge 2020-10-12 13:17:20 +02:00
Chaoscaot
d3cbf29a3f Add Fabric Challenge 2020-10-12 13:15:53 +02:00
Chaoscaot
bebf5cdebb Fixing Joining World 2020-10-12 13:06:11 +02:00
Chaoscaot
780ecb41d4 Fixed Bugs when coming from Bauserver 2020-10-12 12:58:09 +02:00
f99c4580ce Merge pull request 'Allow Fabric' (#127) from allow-fabric into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-12 12:46:05 +02:00
Chaoscaot
2fe2074910 Changed to Server Switch Event 2020-10-12 11:51:44 +02:00