Commit Graph

1046 Commits

Author SHA1 Message Date
c3db2b7f86 VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java aktualisiert
All checks were successful
SteamWarCI Build successful
2025-06-01 14:36:49 +02:00
c30f24ab8f Hotfix Protocol Version for real now
All checks were successful
SteamWarCI Build successful
2025-05-31 21:32:19 +02:00
bcb0ad4bef Merge branch 'main' into update/1.21.5
All checks were successful
SteamWarCI Build successful
# Conflicts:
#	VelocityCore/src/de/steamwar/velocitycore/ServerVersion.java
2025-05-31 20:20:07 +02:00
f2a46e54ea Revert "Add WeatherCommand"
All checks were successful
SteamWarCI Build successful
This reverts commit 30fa3fd66e.
2025-05-31 19:40:08 +02:00
daede98a0f Hotfix TeamCommand
All checks were successful
SteamWarCI Build successful
2025-05-31 17:45:24 +02:00
d37a14f280 Move some constants around
All checks were successful
SteamWarCI Build successful
2025-05-31 10:04:21 +02:00
083c5c07c2 Update CMDs for all current CustomModelData usages
All checks were successful
SteamWarCI Build successful
2025-05-31 09:39:03 +02:00
7b059cde0e Add customModelData to Velocity SWItem
All checks were successful
SteamWarCI Build successful
2025-05-31 08:51:56 +02:00
30fa3fd66e Add WeatherCommand
All checks were successful
SteamWarCI Build successful
2025-05-30 21:37:07 +02:00
37f6723542 Add CommonCore.DATA and CMDs
All checks were successful
SteamWarCI Build successful
2025-05-29 17:12:32 +02:00
7a9740c4c4 Fix EventFight activeFights query and add null check for spectatePort in CookieEvents
All checks were successful
SteamWarCI Build successful
2025-05-29 15:05:01 +02:00
54eec6d57c Merge pull request 'SchematicSystem: Add music disks to auto checker' (#59) from SchematicSystem/Allow-music-disks into main
All checks were successful
SteamWarCI Build successful
Reviewed-on: #59
Reviewed-by: Chaoscaot <max@chaoscaot.de>
2025-05-29 14:37:49 +02:00
2f93f336c9 Add image upload functionality and enhance page metadata creation.
All checks were successful
SteamWarCI Build successful
2025-05-29 14:30:06 +02:00
62f9d37230 Merge pull request 'Add tech hider bug handling for arena subservers in BugCommand' (#62) from bug-auto-techhider-bug into main
All checks were successful
SteamWarCI Build successful
Reviewed-on: #62
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-29 14:27:56 +02:00
b479b6667b Merge pull request 'Enable a Dirt Block (Schem owner -1 and Name like GameMode) to be selected for any ServerTeam member' (#51) from FightSystem/EnableDirtBlockForServerTeam into main
All checks were successful
SteamWarCI Build successful
Reviewed-on: #51
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-29 12:06:41 +02:00
9bc01a4e3b Revert FightTeam
All checks were successful
SteamWarCI Build successful
2025-05-29 12:00:12 +02:00
b14cf445df Fix PR stuff
All checks were successful
SteamWarCI Build successful
2025-05-29 11:32:50 +02:00
527bc39d38 Add some more CustomModelData ids to items
All checks were successful
SteamWarCI Build successful
2025-05-29 08:44:58 +02:00
8defbaa18b Add tech hider bug handling for arena subservers in BugCommand
All checks were successful
SteamWarCI Build successful
2025-05-29 00:03:25 +02:00
a5bb62590c Refactor page routing and point calculation logic
All checks were successful
SteamWarCI Build successful
Streamlined the `page` routing structure by optimizing branch and file handling, introducing a reusable `filesInDirectory` method, and cleaning up redundancies. Enhanced `EventGroup` point calculation with incremental updates, new helper methods (`getTeams`, `getTeamsId`), and better handling of unfinished fights.
2025-05-28 23:57:29 +02:00
c35d4741a0 Add TexturePackSystem
All checks were successful
SteamWarCI Build successful
2025-05-28 14:19:21 +02:00
a2a101c4e3 Merge pull request 'Add NoGravity' (#61) from FightSystem/EnableNoGravityFights into main
All checks were successful
SteamWarCI Build successful
Reviewed-on: #61
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-27 19:58:55 +02:00
277e1f9f9b Add NoGravity
All checks were successful
SteamWarCI Build successful
2025-05-27 18:15:03 +02:00
380506542f Remove some more duplicates
All checks were successful
SteamWarCI Build successful
2025-05-23 09:13:23 +02:00
d410484e4c Update JDA to newest version
All checks were successful
SteamWarCI Build successful
2025-05-22 19:47:14 +02:00
8768fd7d81 Refactor event handling and group assignment logic
All checks were successful
SteamWarCI Build successful
Replaced `fight.event` with `event.eventID` for consistency and improved event handling. Adjusted `setGroup` to accept `Integer` instead of `EventGroup` to simplify group assignment logic. Removed unused `event` field in `CreateEventFight` and streamlined related processing.
2025-05-22 19:42:49 +02:00
374e314faa Add new WATUT Channel
All checks were successful
SteamWarCI Build successful
2025-05-22 18:19:31 +02:00
45a8aab321 Revert "Add "/event vote" command for SteamWarArcade Event"
All checks were successful
SteamWarCI Build successful
This reverts commit 7f215b921e.
2025-05-18 19:44:29 +02:00
0d15bbc266 Revert "Add "/event vote" command for SteamWarArcade Event"
This reverts commit a5b61fb0d6.
2025-05-18 19:44:28 +02:00
7fa97ce36c Revert "Fix TowerRun event"
This reverts commit 8cd088050d.
2025-05-18 19:44:28 +02:00
8cd088050d Fix TowerRun event
All checks were successful
SteamWarCI Build successful
2025-05-18 16:32:01 +02:00
b0bbc09113 Fix TowerRun event
All checks were successful
SteamWarCI Build successful
2025-05-18 16:28:26 +02:00
a5b61fb0d6 Add "/event vote" command for SteamWarArcade Event
All checks were successful
SteamWarCI Build successful
To be removed after event
2025-05-18 16:22:50 +02:00
297e6c9b59 Fix OOM?
All checks were successful
SteamWarCI Build successful
2025-05-18 15:58:31 +02:00
400c78447a Fix IngameListener
All checks were successful
SteamWarCI Build successful
2025-05-18 15:41:43 +02:00
778d0282d3 Fix IngameListener
All checks were successful
SteamWarCI Build successful
2025-05-18 15:37:43 +02:00
2a314e7035 Add sout
All checks were successful
SteamWarCI Build successful
2025-05-18 15:31:48 +02:00
6ed639fbb3 Add sout
All checks were successful
SteamWarCI Build successful
2025-05-18 13:46:39 +02:00
3a79f19f37 Merge remote-tracking branch 'origin/main'
All checks were successful
SteamWarCI Build successful
2025-05-18 13:34:45 +02:00
f7e81f8204 Hotfix OOM in IngameListener 2025-05-18 13:34:42 +02:00
7f215b921e Add "/event vote" command for SteamWarArcade Event
All checks were successful
SteamWarCI Build successful
To be removed after event
2025-05-18 13:32:09 +02:00
b0be06136d Add 'ergebnis' field to EventFights data model and update logic
All checks were successful
SteamWarCI Build successful
Introduced a new 'ergebnis' field to the EventFights data model to handle fight results. Updated the logic to support processing and updating this field when provided. This ensures better tracking and management of event fight outcomes.
2025-05-18 13:31:14 +02:00
8132e4fca0 Remove code duplication
All checks were successful
SteamWarCI Build successful
2025-05-18 10:34:41 +02:00
bf5eef2ebd Fix copyright nit
Remove SchematicCommand19
2025-05-18 10:28:32 +02:00
D4rkr34lm
69251f42a6 Add music disks to autochecker
All checks were successful
SteamWarCI Build successful
2025-05-17 23:40:48 +02:00
6bbe94150d Merge pull request 'Prevent usage of Flashback channels for restricted players' (#58) from flashback into main
All checks were successful
SteamWarCI Build successful
Reviewed-on: #58
Reviewed-by: Lixfel <lixfel@noreply.localhost>
2025-05-17 11:57:40 +02:00
717cfa8baf Prevent usage of Flashback channels for restricted players
All checks were successful
SteamWarCI Build successful
Added new channel handlers to block Flashback mod channels for users without appropriate permissions. Ensures restricted players using these channels are disconnected with a specific warning message. This enhances control over mod usage and maintains server integrity.
2025-05-16 18:00:23 +02:00
260656ad35 Fix for events
All checks were successful
SteamWarCI Build successful
2025-05-14 19:28:27 +02:00
e893d7934a Fix TowerRun for events
All checks were successful
SteamWarCI Build successful
2025-05-14 19:11:05 +02:00
d0665932f4 Fix TowerRunGame.reset
All checks were successful
SteamWarCI Build successful
2025-05-11 20:19:23 +02:00