Archiviert
1
0
Commit graph

1125 Commits

Autor SHA1 Nachricht Datum
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
f097d97554 Merge pull request 'Add new punishments' (#327) from Punishment++ into master
Reviewed-on: SteamWar/BungeeCore#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
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
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
bc96ab6d96 Reduce message spam through asynchronity
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-02 17:51:14 +02:00
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
ba0c2623f8 Fix checkcommand
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-02 08:47:28 +02:00
c56f221ffc Fix checkcommand
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-02 08:46:16 +02:00
2a5ebe51aa Revert april
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-02 08:12:56 +02:00
3755463c7e Fix error message
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-01 17:09:40 +02:00
1da5c45b22 Allow sql connection parallelity
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-04-01 17:08:08 +02:00
65cdc5b69c Merge pull request 'Update CheckCommand' (#330) from CheckList into master
Reviewed-on: SteamWar/BungeeCore#330
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-04-01 16:08:27 +02:00
97a3ffb3fa Merge pull request 'Improve error logging' (#326) from improveLogging into master
Reviewed-on: SteamWar/BungeeCore#326
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-04-01 16:01:54 +02:00
02e13f5d9e Merge pull request 'Announce event fights on spectate' (#325) from announceSpectate into master
Reviewed-on: SteamWar/BungeeCore#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
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
af61b59c8b Merge pull request 'Fix ChatListener for discord messages' (#331) from FixDiscord into master
Reviewed-on: SteamWar/BungeeCore#331
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-04-01 10:58:58 +02:00
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
54700ce85c Merge branch 'master' into improveLogging 2022-04-01 09:42:58 +02:00
eaa1e873d2 Merge branch 'master' into announceSpectate 2022-04-01 09:42:22 +02:00
10b14d2930 Merge branch 'master' into Punishment++ 2022-04-01 09:41:30 +02:00
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
5874cfc30f Merge branch 'master' into april 2022-04-01 09:08:57 +02:00
7293f741c7 „src/de/steamwar/bungeecore/sql/UserGroup.java“ ändern 2022-03-31 23:50:28 +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
3b358a8666 Fix GDPRQuery
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:34:21 +02:00
385f5a5a36 Fix concurrency
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:32:07 +02:00
8ce1d66817 Add Connection reset
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 18:27:51 +02:00
5838f6ed69 Improve error logging
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 16:49:40 +02:00
fa79a64d6b Announce event fights on spectate
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 16:49:21 +02:00
82bd4b752d Fix 1.18
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 14:43:54 +02:00
f4512f1db9 Merge pull request '1.18 Bau' (#324) from 1.18bau into master
Reviewed-on: SteamWar/BungeeCore#324
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-30 14:32:12 +02:00
bc8db04edf 1.18 Bau
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 11:38:29 +02:00
9a17bb87f6 Remove unrequired commands
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-30 10:39:47 +02:00
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
626a876f0f Merge branch 'master' into fabric_mod_sender 2022-03-23 16:50:54 +01:00
72a5027de0 Fix precision
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 19:07:47 +01:00
8492bc447a 1.4.
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 17:18:20 +01:00
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
85017b1440 Merge branch 'master' into tutorial 2022-03-22 09:23:13 +01:00
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
e2fd1754ce Fix some bugs + minor improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-20 19:08:55 +01:00
58dd7486f7 Merge branch 'master' into tutorial 2022-03-20 16:19:53 +01:00
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
87dbca480e Tutorial first steps
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 18:38:45 +01:00
6489ae51cf Merge pull request 'Fix Message again for the final time!' (#313) from ResourceBundles2.0 into master
Reviewed-on: SteamWar/BungeeCore#313
2022-03-16 16:38:45 +01:00
c08bfe75b9 Fix ConcurrentModificationException
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:30:38 +01:00
f04ccc6ea7 Fix emblems
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:25:43 +01:00
c0301a8014 Code simplification
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:24:19 +01:00
46499633d0 Code cleanup, cache invalidation fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 14:56:37 +01:00
yoyosource
9a1f067dcd Merge remote-tracking branch 'origin/ResourceBundles2.0' into ResourceBundles2.0 2022-03-15 19:05:20 +01:00
yoyosource
1f50bf15aa Fix Message 2022-03-15 19:05:08 +01:00
fe2097b68f Merge branch 'master' into ResourceBundles2.0 2022-03-15 18:51:42 +01:00
yoyosource
e038f807e9 Hotfix FightEndsHandler 2022-03-15 18:31:47 +01:00
yoyosource
1fd34f8ccd Update Message stuff 2022-03-15 18:12:55 +01:00
yoyosource
a78da0e2cf Update Message stuff 2022-03-15 18:00:28 +01:00
yoyosource
8ee960e002 Fix message 2022-03-15 17:54:10 +01:00