Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität
2.062 Commits 11 Branches 0 Tags 7,5 MiB
2ef06f61e4
Commit graph

2062 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Chaoscaot
a028db5462 Show no Chat Reports (Next to chat and Server List for NoChatReportsMod) 2022-09-18 11:51:36 +02:00
yoyosource
c36a6885cf Fix merge conflicts 2022-09-17 11:34:51 +02:00
yoyosource
47dd2503cf Merge branch 'master' into BauCommand 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BauCommand.java
 2022-09-17 11:33:10 +02:00
Lixfel
4cfb7830f9 Merge pull request '+Fixed player connect with teleport' (#435) from BauLock into master 
Reviewed-on: SteamWar/BungeeCore#435
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-17 09:30:15 +02:00
MoBrot
27ddb447fe Merge remote-tracking branch 'origin/BauLock' into BauLock 2022-09-16 23:39:12 +02:00
MoBrot
e483e32b31 +Add BauLock copyright header 2022-09-16 23:38:55 +02:00
Lixfel
be41928520 Merge branch 'master' into BauLock 2022-09-16 23:30:02 +02:00
MoBrot
3e9bd2768b +Fixed player connect with teleport 2022-09-16 23:27:52 +02:00
yoyosource
eb8d8380d9 Update BauCommand 2022-09-14 17:54:25 +02:00
yoyosource
1a51e2c6a2 Merge branch 'master' into BauCommand 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BauCommand.java
 2022-09-14 17:47:48 +02:00
Lixfel
160d482392 Merge pull request 'Add BauLock' (#415) from BauLock into master 
Reviewed-on: SteamWar/BungeeCore#415
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-14 11:51:49 +02:00
MoBrot
451de152b2 +Fixed noby and IllegalArgumentException 2022-09-13 22:52:38 +02:00
MoBrot
e5ba1ad633 Merge remote-tracking branch 'origin/BauLock' into BauLock 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/BauCommand.java
 2022-09-13 22:36:27 +02:00
Lixfel
338772c002 Merge pull request 'BauLock2' (#432) from BauLock2 into BauLock 
Reviewed-on: SteamWar/BungeeCore#432
 2022-09-13 22:35:17 +02:00
Lixfel
f9f0f83779 Don't kick players 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-13 22:34:59 +02:00
MoBrot
133f795c8f Merge remote-tracking branch 'origin/BauLock' into BauLock 2022-09-13 22:07:09 +02:00
Lixfel
093b861342 Merge pull request 'Fix Double Bans' (#434) from fix_double_bans into master 
Reviewed-on: SteamWar/BungeeCore#434
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-12 17:56:22 +02:00
Chaoscaot
02c81068e7 Fix Double Bans 2022-09-12 17:54:42 +02:00
Lixfel
85c5201c82 Fix language 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 20:10:17 +02:00
Lixfel
6c9f9d17f8 Merge pull request 'Whois Fixes' (#433) from whois_fix into master 
Reviewed-on: SteamWar/BungeeCore#433
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-11 20:05:18 +02:00
Chaoscaot
2919283963 Whois Fixes 2022-09-11 20:04:24 +02:00
Lixfel
7377f5513a Fix several issues 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 18:34:50 +02:00
Lixfel
fd1efaa22b Fix case sensitivity 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 18:16:06 +02:00
Lixfel
29a30ec5bb Fix missing return 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 18:11:58 +02:00
Lixfel
e83b399593 Fix wrong CommonDB 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 18:09:23 +02:00
Lixfel
3e1d60245a Fix fatal issues 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-11 18:08:42 +02:00
Lixfel
39562c9923 Merge pull request 'Bump JDA & close Inpustream' (#431) from fix_bot_upload into master 
Reviewed-on: SteamWar/BungeeCore#431
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-11 15:29:36 +02:00
Chaoscaot
1af7b03987 Bump JDA & close Inpustream 2022-09-11 15:28:37 +02:00
Lixfel
197180631f Merge pull request 'Add current infos to Whois' (#430) from more_whois into master 
Reviewed-on: SteamWar/BungeeCore#430
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-11 15:02:42 +02:00
Chaoscaot
d7530cae86 Add current infos to Whois 2022-09-09 20:38:37 +02:00
yoyosource
eee3dba1de Simplify arena map typemapper 2022-09-09 16:35:05 +02:00
yoyosource
6206a80cc1 Merge remote-tracking branch 'origin/master' 2022-09-09 16:11:39 +02:00
yoyosource
9e579ee3d6 Hotfix case sensitive maps 2022-09-09 16:11:34 +02:00
Lixfel
1cbec668d1 Merge branch 'master' into BauLock 
# Conflicts:
#	src/de/steamwar/bungeecore/commands/HelpCommand.java
 2022-09-09 15:49:04 +02:00
Lixfel
6ab0d3d983 Remove could not decode from ErrorLogger 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-09 08:40:55 +02:00
MoBrot
d4cd8a16a0 +Removed not used if statement 2022-09-08 21:32:41 +02:00
MoBrot
9a5b938fba +Fixed Owner message when locked 2022-09-08 21:28:21 +02:00
MoBrot
fe0d0eaffb +Add Owner message when bau is locked for Team 2022-09-08 20:49:17 +02:00
yoyosource
42898b0d4d Hotfix npe 2022-09-08 19:45:20 +02:00
yoyosource
88724c75e3 Merge remote-tracking branch 'origin/master' 2022-09-08 18:24:38 +02:00
yoyosource
e3e68af80f Hotfix ServerTeamchatCommand 2022-09-08 18:24:31 +02:00
Lixfel
3d958800fc Remove sorted checker in fabric 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-08 17:29:25 +02:00
Lixfel
150cf78607 Merge pull request 'Overload protection' (#429) from overloadProtection into master 
Reviewed-on: SteamWar/BungeeCore#429
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2022-09-06 20:51:14 +02:00
yoyosource
19c02ad786 Merge remote-tracking branch 'origin/overloadProtection' into BauCommand 2022-09-06 20:06:03 +02:00
Lixfel
43d5cb47bb Overload protection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2022-09-06 19:08:00 +02:00
yoyosource
4c44bc0a83 Update BauCommand 2022-09-06 17:13:15 +02:00
yoyosource
2676f97cfb Hotfix TypeMappers 2022-09-06 16:45:56 +02:00
Lixfel
baef387fdb Merge pull request 'Commands' (#427) from Commands into master 
Reviewed-on: SteamWar/BungeeCore#427
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2022-09-06 15:44:36 +02:00
yoyosource
16c3f93741 Fix stuff 2022-09-06 15:36:27 +02:00
yoyosource
2325190cf1 Fix stuff 2022-09-03 14:33:00 +02:00