Archiviert
1
0
Commit graph

684 Commits

Autor SHA1 Nachricht Datum
yoyosource
73940661c9 Hotfix StatCommand for no stats 2021-07-12 09:32:58 +02:00
yoyosource
d1b764eb88 Hotfix StatCommand for no stats 2021-07-12 09:32:13 +02:00
yoyosource
e07000ed62 Merge branch 'master' into ListCommand
# Conflicts:
#	src/de/steamwar/bungeecore/BungeeCore.java
2021-07-12 09:26:35 +02:00
b6bd72101b Merge branch 'master' into DevServer 2021-07-12 09:21:39 +02:00
57f84002ba Merge branch 'master' into Better7Sanitize 2021-07-12 09:21:04 +02:00
90e0d1bb44 Merge branch 'master' into plus_local_chat 2021-07-12 09:15:29 +02:00
b2c8fd7290 Merge branch 'master' into plus_local_chat 2021-07-12 09:13:28 +02:00
e3893ce7d4 Merge branch 'master' into StatCommand 2021-07-12 09:06:35 +02:00
e68e477868 Merge branch 'master' into ListCommand 2021-07-12 09:06:29 +02:00
7245c3aa1c Merge branch 'master' into DevServer 2021-07-12 07:37:36 +02:00
yoyosource
587395002a Better 7 sanitize 2021-07-11 13:23:29 +02:00
yoyosource
c8bc438b0c Hotfix color codes for WGS winners 2021-07-11 13:02:30 +02:00
yoyosource
86664ea399 Fix Typo 2021-07-11 08:24:54 +02:00
yoyosource
1879f74ead Add DevCommand 2021-07-10 22:43:15 +02:00
yoyosource
b16b258ba2 Add DevCommand 2021-07-10 22:38:44 +02:00
yoyosource
47711b746e Add DevCommand 2021-07-10 22:04:56 +02:00
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
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
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