Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity
125 Commits 1 Branch 0 Tags
09a8dc0786b3d6591add3d012d32b8763a8cd656
Commit Graph

125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lixfel 09a8dc0786 Fix Badlion (tested), Fix Client channel registration and brand detection 2024-08-18 15:36:50 +02:00
Lixfel 5afdc04e1e Merge branch 'main' into VelocityCore/BadlionRestrictions 2024-08-18 14:40:22 +02:00
Lixfel acbe6f2f5d Merge pull request 'Fix Tablist' (#9) from VelocityCore/Tablist into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/9
Reviewed-by: Chaoscaot <chaos@chaoscaot.de>
 2024-08-18 11:13:19 +02:00
Lixfel 4f4e0bab69 Fix tablist (some tests done, potentielly fixed) 2024-08-17 19:03:32 +02:00
Lixfel bad291f8ce Merge branch 'main' into VelocityCore/Tablist 2024-08-17 17:57:39 +02:00
Lixfel b8e50dc139 Merge pull request 'Add Missing Commits' (#28) from VelocityCore/missing-commits into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/28
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-16 19:28:42 +02:00
Chaoscaot 765a0ef1f3 Add Missing Commits 2024-08-16 18:04:02 +02:00
Lixfel 4a2afee27d Fix Badlion restrictions (untested) 
Fixes #dreamjxnas-bug-325.
 2024-08-16 17:56:00 +02:00
Lixfel 8e1b2dea57 Merge pull request 'Fix Discord commands with zero arguments' (#25) from VelocityCore/FixArgumentlessCommands into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/25
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-16 17:38:03 +02:00
YoyoNow 0fd397a390 Merge pull request 'Change AFK Stopper to work based on real time' (#26) from BauSystem/RealtimeAFKStopper into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/26
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-16 17:36:52 +02:00
Lixfel 07284eae6a Change AFK Stopper to work based on real time 
Fixes #lag145-bug-203.
 2024-08-16 17:32:51 +02:00
Lixfel 7d7de2c2f3 Fix Discord commands with zero arguments 2024-08-16 17:06:23 +02:00
Lixfel c65c23d5e2 Fix VersionAnnouncer ACTION_BAR with Prefix 2024-08-16 16:52:20 +02:00
Chaoscaot 43550ee8df Fixes 2024-08-16 12:04:16 +02:00
Chaoscaot 66f5b6491c Add TNTLeague Module 2024-08-16 11:38:54 +02:00
Chaoscaot f8f184514b Add steamwar.kotlin.gradle 2024-08-16 11:26:52 +02:00
Chaoscaot 36a9877393 Fix KotlinCore 2024-08-16 10:48:17 +02:00
YoyoNow 0162fadd15 Enable KotlinCore 2024-08-16 10:42:59 +02:00
YoyoNow 805b571de6 Merge pull request 'Add reset of Region flags on Region reset' (#19) from BauSystem/RegionFlagReset into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/19
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-12 18:59:58 +02:00
YoyoNow 5a92c4cf8e Merge pull request 'Send Server version to Client when version differs' (#23) from BauSystem/VersionAnnouncer into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/23
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-12 18:57:03 +02:00
Lixfel 80a1c908ce -> ActionBar 2024-08-12 18:23:45 +02:00
Lixfel a60b579b0d Send Server version to Client when version differs 2024-08-12 18:21:41 +02:00
Lixfel f7ea08e6d0 Merge pull request 'Fix lore color of Detonator' (#20) from LobbySystem/NpcChat into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/20
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-11 13:02:40 +02:00
TheBreadBeard 5269586761 Fix lore color of Detonator 2024-08-11 10:20:04 +02:00
YoyoNow 760f022cdb Add reset of Region flags on Region reset 2024-08-09 16:45:22 +02:00
Lixfel 222b26f782 Merge pull request 'Clear Subserver Baumembercache on delmember' (#11) from BauSystem/ClearCacheOnDelmember into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/11
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-08 23:40:52 +02:00
Lixfel e717172c63 Clear Subserver Baumembercache on delmember 2024-08-08 08:27:53 +02:00
YoyoNow 7896fce4cf Hotfix BauScoreboard 2024-08-07 15:48:34 +02:00
Lixfel a5dde09ae4 Merge pull request 'Update SteamwarUser.getServerTeam' (#8) from CommonCore/SteamwarUser into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/8
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-07 14:41:26 +02:00
Lixfel 21158899e1 Merge pull request 'Fix BauCommand.setBuilder' (#10) from VelocityCore/BauCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/10
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-07 14:38:48 +02:00
YoyoNow dbc6575ef5 Fix BauCommand.setBuilder 2024-08-07 14:33:33 +02:00
YoyoNow 10e10c151b Hotfix BauSystem 2024-08-07 13:35:22 +02:00
YoyoNow 4efd30bdfb Fix possible NPE! 2024-08-07 09:33:31 +02:00
YoyoNow 23556b790a Trigger rebuild, because of some interesting erroir 2024-08-07 09:23:34 +02:00
YoyoNow 704fc53e9e Possible fix for Tablist 2024-08-07 09:22:30 +02:00
YoyoNow b4461269ec Revert "Hotfix TablistManager (Might be reverted directly)" 
This reverts commit 79dbb756e6.
 2024-08-07 09:11:17 +02:00
YoyoNow 79dbb756e6 Hotfix TablistManager (Might be reverted directly) 2024-08-07 09:09:24 +02:00
YoyoNow 31ff0e623f Hotfix BauSystem startup 2024-08-06 22:16:36 +02:00
YoyoNow d817ffd43d Update SteamwarUser.getServerTeam 2024-08-06 18:26:15 +02:00
Lixfel 3d36a7b7a3 Merge pull request 'Add SendCommand' (#5) from VelocityCore/SendCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/5
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-06 18:07:18 +02:00
YoyoNow 5b730fc67d Update SendCommand 2024-08-06 18:04:59 +02:00
YoyoNow b69bb97da4 Revert ChatListener 2024-08-06 17:26:11 +02:00
YoyoNow 41c46264b7 Possible hotfix ChatListener 2024-08-06 17:18:34 +02:00
YoyoNow b5a4daa483 Add logging to ChatListener 2024-08-06 17:16:57 +02:00
YoyoNow ea7ce3393f Add logging to ChatListener 2024-08-06 17:13:52 +02:00
YoyoNow bab3580f56 Merge pull request 'Remove compile time linkage in favour of class index' (#6) from BauSystem/RemoveLinkage into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/6
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-06 17:09:35 +02:00
Chaoscaot 036341ea2c Fix Joinme Command 2024-08-06 16:36:03 +02:00
YoyoNow d40f2f2aff Hotfix ChatListener 2024-08-06 15:41:11 +02:00
YoyoNow 7516cf5854 Hotfix ArenaMode with RankCommand 2024-08-06 15:39:59 +02:00
YoyoNow 80ec327818 Update SendCommand 2024-08-06 15:32:37 +02:00