SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität
699 Commits 8 Branches 0 Tags 7,6 MiB
186b896bf6
Commit graph

386 Commits

Autor SHA1 Nachricht Datum
jojo
0ed423b596 Fix Water duping with ice 2020-12-30 15:51:31 +01:00
jojo
532268eaf7 Fix Water duping with ice 2020-12-30 15:49:33 +01:00
Chaoscaot
dea991d7d7 Fixing 2020-12-30 13:41:17 +01:00
Chaoscaot
bcd6ed8a90 Use TeamColor 2020-12-28 18:02:04 +01:00
Lixfel
b8b8b1b0f5 Optimize TechKO detection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-24 14:53:29 +01:00
Chaoscaot
250c429a51 Performance Changes 2020-12-21 12:59:09 +01:00
Lixfel
fd3d6d9911 Prevent false positives 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 12:00:46 +01:00
Lixfel
bbc18de42e Fix 1.8 arena 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-19 11:36:06 +01:00
Lixfel
9e4e4ee4f8 Hotfix teamleave 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-11 17:53:37 +01:00
Lixfel
4e65017b50 Performance, Full block techhider, bugfixes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-12-09 18:43:50 +01:00
Chaoscaot
94b248d875 Fixing 2020-12-08 16:01:42 +01:00
Chaoscaot
e431b1323c Fixing 2020-12-07 23:38:14 +01:00
Chaoscaot
030bfbc6a1 Improving 2020-11-30 20:05:07 +01:00
Chaoscaot
fff0380228 Merge remote-tracking branch 'origin/master' into arrow-in-techhider 2020-11-30 19:26:00 +01:00
Lixfel
08b483deb4 Detect and block prefilled inventories in PersonalKitCreator 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-30 17:10:38 +01:00
Chaoscaot
5eedf7bf50 Improving Array 2020-11-28 13:11:43 +01:00
Chaoscaot
9984fc0179 Remove Debug Message 2020-11-28 12:07:41 +01:00
Chaoscaot
5366011bd7 Rework Arrow Tracking 2020-11-28 12:05:27 +01:00
Chaoscaot
8c93f446df Adding Better Tracking 2020-11-27 21:31:39 +01:00
Chaoscaot
afa2217ce3 Adding Better Tracking 2020-11-27 21:07:51 +01:00
Chaoscaot
81ac127bbf Adding Better Tracking 2020-11-27 19:55:26 +01:00
Chaoscaot
664350d286 Add Arrows Stopping in Techhider Blocks 2020-11-27 16:22:15 +01:00
Lixfel
9525873e8c Merge remote-tracking branch 'origin/master' 2020-11-18 14:52:53 +01:00
Lixfel
aac110bad8 Hotfix schempasting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-18 14:52:43 +01:00
Chaoscaot
0dec2b8946 Fixing... 2020-11-17 09:31:28 +01:00
Chaoscaot
e460b04a67 Fixing... 2020-11-17 08:58:50 +01:00
Chaoscaot
26e71da87a Add Record System 2020-11-16 21:36:28 +01:00
Chaoscaot
7dbd3ab5cb Fixing Scoreboard 2020-11-16 21:31:03 +01:00
Chaoscaot
57d5d0fadc Merge branch 'master' into scoreboard-reimplement 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
 2020-11-16 20:54:25 +01:00
Lixfel
59a000d3f2 Fix closed channel packets 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-15 11:24:57 +01:00
Lixfel
aa3d9f4a8a Fix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-12 14:25:38 +01:00
Lixfel
680994aed9 Fix small fightstate bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-10 09:59:19 +01:00
Lixfel
c423d8ea22 Hothotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-09 19:25:21 +01:00
Lixfel
1848622a50 Implementing tps scoreboard parameter 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-07 11:40:01 +01:00
Lixfel
2317505494 Double disconnect fix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 18:32:33 +01:00
Lixfel
fc1400a73a Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 18:07:09 +01:00
Lixfel
3147783ef8 Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:53:57 +01:00
Lixfel
247396bffd Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:37:28 +01:00
Lixfel
c0887a87d0 Start recording all event fights 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:23:15 +01:00
Lixfel
ea63704c38 Kick non players and record more blocks (to prevent ghost blocks) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:11:18 +01:00
Lixfel
5b12e10b98 Fix player despawn 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 12:13:57 +01:00
Lixfel
d9dede725b Fix fightscoreboard recording 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 10:41:45 +01:00
Lixfel
014cee20a8 Temporary only record if recording 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-01 16:17:00 +01:00
Lixfel
06960ffda7 Merge branch 'master' into recordSystem 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
 2020-11-01 16:11:00 +01:00
Lixfel
6189b7278a Hotfix gm 31 in testarena & tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 22:04:04 +01:00
Lixfel
55b27082cb Kick all nonparticipants if Event with SpectateSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 14:06:38 +01:00
Lixfel
acb83e7fbb Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 07:52:08 +01:00
Lixfel
81224b9495 Merge pull request 'tablistName' (#197) from tablistName into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-10-30 07:31:36 +01:00
Lixfel
924ed3b30a Disable TablistPacket on test arenas 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 07:31:21 +01:00
Lixfel
3281469772 Adjust explosion size 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 21:40:28 +01:00
Lixfel
886e624bac Impl. tablist name capability 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 20:51:45 +01:00
Lixfel
a5c19e04c0 Merge pull request 'GameMode 1 Spectator' (#190) from gm1Spectator into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-10-29 19:57:47 +01:00
Lixfel
f04a9edb41 Fix sound strength 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 12:24:43 +01:00
Lixfel
259ca31f2b Tablist name impl. as comments. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 12:19:23 +01:00
Lixfel
9b4744ae05 Don't autoban 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 11:18:06 +01:00
Lixfel
97dd9794ef Merge branch 'master' into gm1Spectator 2020-10-28 11:16:32 +01:00
Lixfel
192602625b Blocked spectator mode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 11:16:25 +01:00
Lixfel
84fa4e8dd0 Might fix #192 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 10:21:13 +01:00
Lixfel
70b90b467b This should fix the waterlogged waterremover problem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-27 15:50:24 +01:00
Lixfel
bef28a99b2 Commit recent changes 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-27 15:33:44 +01:00
jojo
6db5d46af3 Add fileSuffix .recording 2020-10-21 18:32:20 +02:00
Lixfel
8d33e25bec Fix exceptions 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-16 09:11:10 +02:00
Lixfel
da26ddf179 Merge remote-tracking branch 'origin/recordSystem' into recordSystem 2020-10-15 22:10:15 +02:00
Lixfel
20f14670df Despawn all tnt at end of fight 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-15 22:10:08 +02:00
jojo
c04029fb92 Add clearity into RecordSystem comment 2020-10-15 18:55:43 +02:00
Lixfel
cc8b7bd96e Reduce block change packets 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-15 18:42:31 +02:00
Lixfel
0d1a0390fd Merge branch 'master' into recordSystem 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
 2020-10-15 18:03:05 +02:00
Chaoscaot
2bc9bded5c Fixing Scoreboard 2020-10-15 13:14:34 +02:00
Lixfel
66b6e5a6dd Reduce blocking on spectatesystem-blackout 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-15 10:52:06 +02:00
Chaoscaot
e575d7a493 Scoreboard Improvement 2020-10-11 10:22:07 +02:00
jojo
ac1af7ffeb Add CommentPacket 2020-10-10 21:45:14 +02:00
Chaoscaot
1acd3878f5 Changed Fight Scoreboard to SWScoreboard 2020-10-06 23:39:47 +02:00
Chaoscaot
2d06766270 Scoreboard Health 0 Fix 2020-09-27 18:11:46 +02:00
Lixfel
9346011f5b Merge branch 'master' into recordSystem 2020-09-25 16:47:12 +02:00
Lixfel
2b3f08aae2 Set spectators in halfcreative mode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-25 16:35:16 +02:00
Lixfel
de0d7d7340 Gamemode 1 packet 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-09 20:47:50 +02:00
Lixfel
92a3eaefb9 Trigger recompile 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 18:53:57 +02:00
Lixfel
e48c1e7007 Merge branch 'master' into recordSystem 2020-09-08 16:29:17 +02:00
Lixfel
84f23f47c2 Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 16:28:51 +02:00
Lixfel
7028bfbd98 SchemID 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 16:25:14 +02:00
Lixfel
4a26a490d7 Merge branch 'master' into recordSystem 2020-09-08 16:01:06 +02:00
Lixfel
46151ba73f Improving multiversion capability 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 15:58:56 +02:00
Lixfel
a495700f6f Merge branch 'master' into recordSystem 2020-09-08 12:45:33 +02:00
Lixfel
cd1185c464 Simplify multiversioning with removing fall-through code 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 09:52:25 +02:00
Lixfel
6aa99d2d4c Implementing sending teams 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 18:24:28 +02:00
Lixfel
172166e211 Trigger recompilation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 12:00:07 +02:00
Lixfel
38b95a144b Fixing ConcurrentModificationException 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 21:34:46 +02:00
Lixfel
859e404536 Implementing sound at player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 11:43:09 +02:00
Lixfel
90737ca915 Implementing sound at player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 11:39:16 +02:00
jojo
c68d967a82 Add onLeaveEvent 2020-09-05 22:53:25 +02:00
Lixfel
88f6bed639 Open source release merge 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-05 22:22:20 +02:00
Lixfel
d621042f89 Merge branch 'master' into recordSystem 2020-09-05 22:20:56 +02:00
jojo
d6a8974439 Add GZIPOutputStream improvement 2020-09-05 21:46:43 +02:00
Lixfel
80416f3cdb Additional work 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-05 21:43:14 +02:00
Lixfel
e4cd7755b2 Schematic now nullable 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-04 17:59:15 +02:00
Lixfel
6ed7ae0180 Implementing scoreboard, schematics, items 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-01 19:41:30 +02:00
Lixfel
3948115254 Preparing open source release 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-26 18:24:44 +02:00
Lixfel
7e6e4f0312 Working prototype (missing player details & schematic pasting) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 19:18:11 +02:00
jojo
626dbe9660 Add SpectateConnection chat 2020-08-22 15:08:35 +02:00
Lixfel
ab15562e06 Merge to writeUTF 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 11:05:31 +02:00
Lixfel
ce39b0a276 Rework recorder 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 10:45:40 +02:00
Lixfel
0f3943cd73 First player movement implementation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 10:01:57 +02:00
Lixfel
b24a8636da Merge branch 'master' into recordSystem 2020-08-22 09:11:22 +02:00
Lixfel
a563c672e3 Merge branch 'personalKitCreatorRework' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
 2020-08-22 08:36:12 +02:00
Lixfel
ddc5874fe9 It works 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-18 17:48:07 +02:00
Lixfel
ce67d0e4f1 Improve PersonalKitCreator 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-18 17:31:05 +02:00
Jan9103
67fcff7711 code nutzlos gemacht 2020-08-16 11:23:18 +02:00
jojo
19d7d719e8 Add SpectateConnection 2020-08-15 23:31:18 +02:00
Jan9103
bcd3cc976b Sleep Preventer 2020-08-13 23:23:22 +02:00
Lixfel
ed025915a6 Fix spawners 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-30 20:49:56 +02:00
Lixfel
1e327c3588 Implement mutual exclusivity to prevent stacking 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-26 12:13:36 +02:00
Lixfel
d0f97430ae Fix Redstone and Piston item 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-26 08:44:46 +02:00
Lixfel
f441f76f62 Fix 1.16 item selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 11:13:20 +02:00
Lixfel
b13362176c Fix multiple times techko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:58:09 +02:00
Lixfel
10c9cf3ae5 More RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:55:05 +02:00
Lixfel
b73bc9ad5e Merge branch 'master' into recordSystem 2020-07-22 16:48:35 +02:00
Lixfel
2cb8c5e8b3 Fix ELO Calculation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:37:48 +02:00
Lixfel
b2a9a4ed64 Fix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:16:54 +02:00
Lixfel
caa8b4aa6a Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:55:16 +02:00
Lixfel
7858a87b60 Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:53:10 +02:00
Lixfel
a95800e815 Hotfix countdown 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 10:31:18 +02:00
Lixfel
5879ca5e18 Hotfix piston listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:50:39 +02:00
Lixfel
620677d593 Fix entern countdown timer 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:48:17 +02:00
Lixfel
72d3d0314b Fixing fire arrow bug and kit gui bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:53:04 +02:00
Lixfel
0d33e8c508 Merge branch 'multi-stage-entern' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
 2020-07-11 07:22:36 +02:00
Lixfel
7af46a1f13 More WIP RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:17:10 +02:00
Lixfel
7e66c9895c Only one spectate state init 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:36:56 +02:00
Lixfel
b5bcea06b7 Send ELO to players + fix potential crash issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:35:37 +02:00
Lixfel
8ebf509b4e Implementing ranked computation and setting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:07:11 +02:00
Lixfel
c1261a4fa2 First ranked (ranked saving still missing) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 17:56:35 +02:00
Lixfel
727129fe8e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-06 17:39:45 +02:00
Lixfel
2aabded41e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-05 16:29:21 +02:00
Lixfel
1261459b79 Fix fightstatistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 11:04:38 +02:00
Lixfel
c13b024f93 First sections of a record system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 10:49:49 +02:00
Lixfel
228cb9e768 Fix non TNT-Kits only no tnt 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 09:33:31 +02:00
Lixfel
a9907b9ad1 Disable TNT explosions in testarenas in Pre running state 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 21:10:07 +02:00
Lixfel
d04d8f65b3 Fix GM3 in your head issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 20:41:08 +02:00
Lixfel
87f13942b1 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:16:54 +02:00
Lixfel
669a822bd6 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:14:45 +02:00
Lixfel
e4fe75693a Finish enter handler 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 09:40:29 +02:00
Lixfel
3b46d45bc0 Merge branch 'master' into multi-stage-entern 2020-06-22 08:58:58 +02:00
Lixfel
51fe8cfbe5 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 16:56:14 +02:00
Lixfel
cf8f36630e Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:27:28 +02:00
Lixfel
eb6f45a485 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:18:46 +02:00
Lixfel
d462d7d008 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:16:54 +02:00
Lixfel
77133bf72a Revert "Sync WaterTechKO-Detector?" 
This reverts commit ff965cca

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:22:53 +02:00
Lixfel
ff965cca75 Sync WaterTechKO-Detector? 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:21:50 +02:00
Lixfel
2ee2d74432 Hotfix watertechko + simplify and speedup 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:38:14 +02:00
Lixfel
aed86fc97b Some refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:19:57 +02:00
Lixfel
10c461f317 Merge pull request 'Add GamemodeCommand' (#162) from Gamemode into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
 2020-06-03 08:45:36 +02:00