yoyosource
|
07da2c56a3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/de/steamwar/bungeecore/listeners/BrandListener.java
|
2022-04-27 09:59:21 +02:00 |
|
yoyosource
|
6e158b38b8
|
Speed BrandListener up
|
2022-04-27 09:58:15 +02:00 |
|
|
|
d6c82e923f
|
Speed BrandListener up
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-26 19:58:41 +02:00 |
|
yoyosource
|
93dcb0d202
|
Revert "Update stuff"
This reverts commit f61fcde5c9.
|
2022-04-26 19:25:32 +02:00 |
|
yoyosource
|
aaf389ea4c
|
Merge remote-tracking branch 'origin/Punishment++' into Punishment++
|
2022-04-26 18:18:34 +02:00 |
|
yoyosource
|
f61fcde5c9
|
Update stuff
|
2022-04-26 18:18:27 +02:00 |
|
|
|
d0bbdd903b
|
Merge branch 'master' into Punishment++
|
2022-04-26 15:26:00 +02:00 |
|
yoyosource
|
9a28173496
|
Update stuff
|
2022-04-26 15:21:44 +02:00 |
|
yoyosource
|
cc86aa16a0
|
Update stuff
|
2022-04-26 15:21:09 +02:00 |
|
yoyosource
|
2ef6901f8e
|
Update WhoisCommand
Add mutlie note punishments
|
2022-04-25 11:09:08 +02:00 |
|
|
|
50ac0ddc55
|
Speed Brandlistener up
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-24 17:54:06 +02:00 |
|
yoyosource
|
f52444f6e5
|
Add some new punishments after talking with mods
|
2022-04-24 15:02:03 +02:00 |
|
|
|
f30b779347
|
Fix BrandListener performance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-24 08:29:21 +02:00 |
|
Chaoscaot
|
7191531045
|
Merge remote-tracking branch 'origin/master' into arena_merging_2.0
# Conflicts:
# src/de/steamwar/bungeecore/commands/FightCommand.java
|
2022-04-23 12:19:41 +02:00 |
|
yoyosource
|
cd5bc889a6
|
Fix pr stuff
|
2022-04-23 11:01:13 +02:00 |
|
yoyosource
|
39471cf468
|
Merge remote-tracking branch 'origin/Teamserver' into Teamserver
|
2022-04-23 10:54:45 +02:00 |
|
yoyosource
|
383cd6097c
|
Fix pr stuff
|
2022-04-23 10:54:38 +02:00 |
|
|
|
c976e6f7ce
|
Merge branch 'master' into Teamserver
|
2022-04-22 21:37:02 +02:00 |
|
yoyosource
|
b744f5286f
|
Update some stuff
|
2022-04-22 21:36:55 +02:00 |
|
|
|
9ac5a8ef8a
|
Fix sends
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 18:47:21 +02:00 |
|
|
|
015a3cfa52
|
Fix broeadcasts
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 17:26:28 +02:00 |
|
|
|
329d80f037
|
Fix Arenaserver
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 17:10:32 +02:00 |
|
|
|
4d53e8ced9
|
Fix chatcolor, arenacommand
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 16:14:35 +02:00 |
|
yoyosource
|
b8a3512643
|
Add SubserverProtocolFixer
|
2022-04-22 15:55:34 +02:00 |
|
|
|
f1f334a750
|
Fix msg, tp etc.
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 15:44:42 +02:00 |
|
yoyosource
|
75a6114447
|
Merge branch 'master' into Teamserver
# Conflicts:
# src/de/steamwar/bungeecore/listeners/ChatListener.java
|
2022-04-22 15:23:39 +02:00 |
|
|
|
f8232fcb48
|
Fix chat no receiver
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 15:16:33 +02:00 |
|
|
|
02fd7eb965
|
Fix discord targets
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-22 10:36:28 +02:00 |
|
|
|
4665d42fc7
|
Fix small issues
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-21 13:04:44 +02:00 |
|
|
|
c1048cfdbd
|
Current state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-19 20:32:02 +02:00 |
|
Chaoscaot
|
0d6d342740
|
🐛 Fixes
|
2022-04-16 16:24:38 +02:00 |
|
Chaoscaot
|
c0f8f9274a
|
Merge branch 'master' into arena_merging_2.0
|
2022-04-16 16:13:18 +02:00 |
|
Chaoscaot
|
d854621752
|
🐛 Fixes
|
2022-04-16 16:13:10 +02:00 |
|
yoyosource
|
4a9ba9554a
|
Fix Teamserver integration
|
2022-04-16 09:54:40 +02:00 |
|
|
|
54932f6ebc
|
Current state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-14 22:24:36 +02:00 |
|
|
|
0bf5a65850
|
Current state
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-14 20:44:09 +02:00 |
|
yoyosource
|
3e315ece3b
|
Merge remote-tracking branch 'origin/Teamserver' into Teamserver
|
2022-04-13 22:31:13 +02:00 |
|
yoyosource
|
2d3466aecb
|
Fix TeamCommand tablist
|
2022-04-13 22:30:53 +02:00 |
|
yoyosource
|
ea194d0f31
|
Fix TeamCommand
|
2022-04-13 22:21:08 +02:00 |
|
|
|
6abf85718c
|
Merge branch 'master' into Teamserver
|
2022-04-13 22:02:48 +02:00 |
|
yoyosource
|
8191c134c7
|
Update local chat
|
2022-04-13 22:00:31 +02:00 |
|
yoyosource
|
acb7aa1efb
|
Update TeamCommand
|
2022-04-13 21:51:40 +02:00 |
|
yoyosource
|
10b6d2b38e
|
Update Team SQL api
|
2022-04-13 21:22:56 +02:00 |
|
|
|
336d4f6a3c
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-13 20:55:51 +02:00 |
|
|
|
9dcb35a91e
|
Fix pipeline null errors
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-13 20:35:47 +02:00 |
|
|
|
35bac7bbf7
|
Merge branch 'master' into BCCommands
|
2022-04-11 10:28:07 +02:00 |
|
yoyosource
|
b5bf48ce2a
|
Update /bc to allow commands
|
2022-04-11 10:27:49 +02:00 |
|
|
|
e3b9329de0
|
Merge pull request 'Ranked' (#333) from Ranked into master
Reviewed-on: SteamWar/BungeeCore#333
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-11 08:23:12 +02:00 |
|
|
|
4a0c50a08d
|
Merge pull request 'Add Replay WIPISCH' (#334) from Replay into master
Reviewed-on: SteamWar/BungeeCore#334
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-11 08:08:03 +02:00 |
|
yoyosource
|
e723224282
|
Fix Fabric stuff
|
2022-04-10 20:14:33 +02:00 |
|
Chaoscaot
|
190828692c
|
🐛 Fixing Punishment Errors
|
2022-04-10 19:20:16 +02:00 |
|
yoyosource
|
fa5d4ad983
|
Update some stuff
|
2022-04-09 22:08:17 +02:00 |
|
yoyosource
|
7a48584cbb
|
Update some stuff
|
2022-04-09 21:36:18 +02:00 |
|
yoyosource
|
4bdead92b5
|
Update some stuff
|
2022-04-09 21:30:52 +02:00 |
|
|
|
d67c9bac66
|
Merge pull request 'Show eventfights as finished immediatly' (#340) from instantEventend into master
Reviewed-on: SteamWar/BungeeCore#340
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2022-04-09 21:06:56 +02:00 |
|
|
|
89f525adb4
|
Merge pull request 'Update some stuff' (#339) from FabricModStuff into master
Reviewed-on: SteamWar/BungeeCore#339
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-09 20:58:27 +02:00 |
|
|
|
dbe2349f4f
|
Merge pull request 'Button Spliting' (#336) from buttons into master
Reviewed-on: SteamWar/BungeeCore#336
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2022-04-09 20:57:46 +02:00 |
|
|
|
eb8a8a2e07
|
Show eventfights as finished immediatly
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-09 16:58:51 +02:00 |
|
|
|
1bc5011d4f
|
Prevent ProcessingSpam
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-08 13:21:45 +02:00 |
|
|
|
4f6bf71f82
|
Fix tp
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-04-08 13:12:00 +02:00 |
|
yoyosource
|
c367f11120
|
Update some stuff
|
2022-04-06 20:19:38 +02:00 |
|
Chaoscaot
|
f5eaadba4f
|
🎨 Now?
|
2022-04-06 18:33:44 +02:00 |
|
Chaoscaot
|
081a1d42ff
|
Merge branch 'master' into arena_merging_2.0
|
2022-04-06 18:32:05 +02:00 |
|
yoyosource
|
d585a6fa09
|
Merge remote-tracking branch 'origin/Ranked' into Ranked
|
2022-04-06 17:01:37 +02:00 |
|
yoyosource
|
169d26852c
|
Update some stuff
|
2022-04-06 17:01:33 +02:00 |
|
|
|
519e732310
|
Merge branch 'master' into Ranked
|
2022-04-06 16:59:21 +02:00 |
|
yoyosource
|
9a0b3a41b9
|
Update some stuff
|
2022-04-06 16:59:11 +02:00 |
|
|
|
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 |
|
Chaoscaot
|
cae6427c6a
|
Merge remote-tracking branch 'origin/arena_merging_2.0' into arena_merging_2.0
|
2022-04-03 20:58:28 +02:00 |
|
Chaoscaot
|
fa8c1c9004
|
✅ PR Stuff
|
2022-04-03 20:58:21 +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 |
|
Chaoscaot
|
7a04359ecb
|
Merge branch 'master' into arena_merging_2.0
|
2022-04-01 18:00:50 +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 |
|
Chaoscaot
|
143cc279d3
|
🐛 Use it now
|
2022-03-31 23:02:26 +02:00 |
|
Chaoscaot
|
ef8e5a3a0d
|
✨ Add Arena Merging 2.0
|
2022-03-31 23:01:20 +02:00 |
|
Chaoscaot
|
a09ee03937
|
🎨 Using code that is already Present
|
2022-03-31 22:49:24 +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 |
|
