Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 21:48:43 +01:00
Code Issues Projects Releases Wiki Activity
674 Commits 5 Branches 0 Tags 4.9 MiB
a1f914d29c
Commit Graph

273 Commits

Author SHA1 Message Date
Daniel Saukel
cb6add4fc8 Cleanup 2017-10-04 23:57:12 +02:00
Daniel Saukel
2be85aa1cf Update /dxl status 2017-09-21 19:38:31 +02:00
Daniel Saukel
b79d7f91c6 Use PlayerCollection 2017-09-21 18:15:49 +02:00
Daniel Saukel
4aa23b04c3 Update to DRECommons 3.1.1 2017-07-21 18:33:21 +02:00
Daniel Saukel
faa6d220f0 Restructured project 2016-07-09 02:41:45 +02:00
Daniel Saukel
27afe9b1fd #39: Copy files and load worlds asynchronously 2016-07-08 20:41:04 +02:00
Daniel Saukel
3778009785 Added backup system; resolves #103 2016-07-06 16:13:43 +02:00
Daniel Saukel
3b671a6005 Delay tasks after first 2016-07-06 14:53:26 +02:00
Daniel Saukel
2389d54490 Added F (fortune) trigger; resolves #105 2016-07-05 20:05:36 +02:00
Daniel Saukel
cd0fe34bf4 Fix CME 2016-07-05 19:01:29 +02:00
Daniel Saukel
284c03f029 Several fixes 2016-07-05 18:39:49 +02:00
Daniel Saukel
c03fab0653 Debugging 2016-07-03 14:52:09 +02:00
Daniel Saukel
a73a548b6e Move IDFile to EditWorld; fix instance purging 2016-07-02 20:39:56 +02:00
Daniel Saukel
e06f4a946d Added /dxl kick command; minor changes to the command system 2016-07-01 16:15:42 +02:00
Daniel Saukel
8d80f5731a Fix ClassCastException 2016-07-01 15:57:21 +02:00
Daniel Saukel
85dfd046c2 Teleport sign: Use correct line array 2016-07-01 14:19:00 +02:00
Daniel Saukel
a45fff42b1 Applied some fixes (rebasing) 2016-07-01 03:13:12 +02:00
Daniel Saukel
79dac4c6fd Added import command 2016-07-01 03:08:30 +02:00
Daniel Saukel
e8f28f7717 Create fake NPC registry 2016-07-01 02:41:22 +02:00
Daniel Saukel
bd6d451841 Resolve Citizens config spam with clones 2016-06-30 20:13:34 +02:00
Daniel Saukel
86341791a0 EditWorld... It's EditWorld! 2016-06-30 20:13:13 +02:00
Daniel Saukel
39281a2bd8 #94: Testing done - fixes under way! 2016-06-30 19:53:29 +02:00
Daniel Saukel
2efa8e0527 Return List instead of CopyOnWriteArrayList 2016-06-28 23:35:25 +02:00
Daniel Saukel
5aca93ef88 Minor code changes 2016-06-27 20:24:03 +02:00
Daniel Saukel
9ae44d6cd5 Equalize world class naming 2016-06-26 12:21:32 +02:00
Daniel Saukel
e2f4a8fe84 Add worlds automatically on object initialization 2016-06-26 00:56:30 +02:00
Daniel Saukel
24fae9da05 #94: Use ResourceWorld instead of String to store floors 2016-06-24 13:35:29 +02:00
Daniel Saukel
141a35f5e7 #94: Resolved all errors due to changes 2016-06-23 18:22:47 +02:00
Daniel Saukel
8bb9fe0eac #94: New world system (WIP) 
- Added world handler class (Worlds)
- Added representation class for unloaded worlds (ResourceWorld)
- Added abstract representation class for all loaded worlds
(InstanceWorld)
- Added class to represent sign data file (SignData)
 2016-06-22 21:40:43 +02:00
Daniel Saukel
19fef13ffb Added status command 2016-06-22 19:47:02 +02:00
Daniel Saukel
863e774266 Accept right clicks on signs 2016-06-22 14:29:41 +02:00
Daniel Saukel
3e118f688e Fix game sign / portal exception 2016-06-22 13:56:41 +02:00
Daniel Saukel
b23efdb3a1 Fix door sign (WIP) 2016-06-21 17:57:24 +02:00
Daniel Saukel
d7dce66347 Add interval and stack size to drop sign 2016-06-21 14:17:11 +02:00
Daniel Saukel
fccaed5bb9 Fixed NPE 2016-06-21 13:56:09 +02:00
Daniel Saukel
101c821af6 Lives modifier sign: Added dying if no lives are left 2016-06-21 13:55:53 +02:00
Daniel Saukel
882393a027 Fixed hologram sign 2016-06-21 12:45:58 +02:00
Daniel Saukel
511725f091 Update to Caliburn 0.1.6 2016-06-20 18:57:53 +02:00
Daniel Saukel
c0736be0ae Ready sign: Don't show multiple and unnecessary progress bars 2016-06-20 18:20:50 +02:00
Daniel Saukel
a4d583532f Fix imports 2016-06-20 18:05:03 +02:00
Daniel Saukel
84ba83b143 Use GameWorld object to store triggers instead of a Map 2016-06-20 17:31:08 +02:00
Daniel Saukel
df843c95ef Holographic Displays integration; resolves #4 2016-06-20 16:03:16 +02:00
Daniel Saukel
c7695f815e Added open door sign 2016-06-20 15:34:46 +02:00
Daniel Saukel
1ddf0df88a Added timer to ready signs 2016-06-20 14:34:02 +02:00
Daniel Saukel
d8b128f013 Revert "Added warp / destination signs" 
This reverts commit 9cfe5ebf4ed9ce371b0ec6b154c0a716e8b0694a.
 2016-06-20 14:06:54 +02:00
Daniel Saukel
00df06e45e Added permission requirement 2016-06-20 14:06:54 +02:00
Daniel Saukel
cea08e440d Multiple start locations; resolves #16 2016-06-20 14:06:54 +02:00
Daniel Saukel
973297b2cc Added warp / destination signs 2016-06-20 14:06:54 +02:00
Daniel Saukel
4a6c450097 Added drop sign; resolves #14 2016-06-20 14:06:54 +02:00
Daniel Saukel
5ff968d394 Added sign to modify lives 2016-06-20 14:06:54 +02:00
Daniel Saukel
45dc39b6e1 Don't load CaliburnAPI if the server is < 1.9; resolves #92 2016-06-20 13:38:15 +02:00
Daniel Saukel
5310a9ceca Overhauled messages; resolves #90 2016-06-19 00:15:34 +02:00
Daniel Saukel
774491e00d Don't count mobs that don't spawn in the current wave; resolves #89 2016-06-17 16:21:26 +02:00
Daniel Saukel
e3aeebd07f Fix some errors without Vault / PEX 2016-06-17 16:16:40 +02:00
Daniel Saukel
2ee39cbba8 #40: Add player names to buttons 2016-06-17 15:44:19 +02:00
Daniel Saukel
4fb23b482b #40: Don't start games if requirements are not satisfied 2016-06-17 15:44:04 +02:00
Daniel Saukel
83b92e9a13 Fix Caliburn integration initialization 2016-06-17 15:14:57 +02:00
Daniel Saukel
a50b0e279c Use UUIDs to store group members 2016-06-13 21:40:04 +02:00
Daniel Saukel
ec58e4c704 Don't treat arrows as external mobs. Resolves #88 2016-06-11 13:23:13 +02:00
Daniel Saukel
7ffec6412b Fixed player leaving / group membership 2016-06-10 20:05:59 +02:00
Daniel Saukel
01c869f897 Don't send leave notifications when players finish the dungeon 2016-06-10 19:11:45 +02:00
Daniel Saukel
1e7e44f224 Remove player from DGroup when he leaves the game 2016-06-10 14:17:16 +02:00
Daniel Saukel
dd6eed6d93 Fix secure objects 2016-06-10 13:56:11 +02:00
Daniel Saukel
eaa198493b Make announcement interval configurable 2016-06-09 23:27:42 +02:00
Daniel Saukel
1851be10cb Fix announcers 2016-06-09 23:27:29 +02:00
Daniel Saukel
ad9e9b0077 Fix language file serialization 2016-06-09 22:22:32 +02:00
Daniel Saukel
fa5020f348 Fix ChatColor import 2016-06-09 22:22:24 +02:00
Daniel Saukel
4766790cab #40: Start games after 30s if enough players joined (UNTESTED) 2016-06-09 00:42:10 +02:00
Daniel Saukel
7716ed0cad Minor improvements for #85. Resolves #84 2016-06-08 16:28:53 +02:00
Daniel Saukel
969fc44d4e Merge branch 'TeleportSign' of git://github.com/Sn0wStorm/DungeonsXL into 0.12 2016-06-08 16:19:30 +02:00
Daniel Saukel
df562765ee Merge branch 'maxDungeons' of git://github.com/Sn0wStorm/DungeonsXL into 0.12 2016-06-08 16:13:00 +02:00
Daniel Saukel
f1892aaece Move settings feature to extended version 2016-06-08 14:53:06 +02:00
Daniel Saukel
f5644bffbc #83: Basic settings GUI 
Added basics, the command, listener and a few player buttons.
 2016-06-06 15:19:15 +02:00
Daniel Saukel
11f67839fe Use Spigot Updater 2016-06-06 14:03:21 +02:00
Daniel Saukel
aa74e02f9f Don't start an announcer task if there are no scripts 2016-06-05 23:52:35 +02:00
Daniel Saukel
275cba0799 Load Caliburn instance 2016-06-05 23:52:11 +02:00
Daniel Saukel
b05fd66fb7 #40 Added per player toggling 2016-06-05 13:42:10 +02:00
Sn0wStorm
dd8d3b1d0f If no direction on sign, use sign rotation 2016-06-01 21:35:23 +02:00
Sn0wStorm
479935f007 Added TeleportSign 2016-06-01 15:22:04 +02:00
Daniel Saukel
758a9f03cd Don't clear drops of custom mobs; resolves #75 2016-06-01 00:44:11 +02:00
Daniel Saukel
a97b345b30 CaliburnAPI / ItemsXL integration. Closes #74; closes #15 2016-06-01 00:44:11 +02:00
Daniel Saukel
eaf1cc0b13 Fix crash bug / weather listener loop 2016-06-01 00:44:11 +02:00
Daniel Saukel
ab4e15fd4f Minor fixes 2016-06-01 00:44:11 +02:00
Daniel Saukel
6c6d1a8552 Fix /dxl leave for edit mode 2016-06-01 00:44:11 +02:00
Daniel Saukel
39a9aa03ca Minor fixes for announcer 2016-06-01 00:44:11 +02:00
Daniel Saukel
6e43b559b6 Fix /dxl leave outside a dungeon 2016-06-01 00:44:11 +02:00
Daniel Saukel
4695c024ab Fix time requirement check 2016-06-01 00:44:11 +02:00
Daniel Saukel
e74b1bbb2e Cancel annoying weather in edit worlds 2016-06-01 00:44:11 +02:00
Daniel Saukel
b3003ac3ed Rewrite player data handling 2016-06-01 00:44:11 +02:00
Daniel Saukel
0a9149eb69 Added group size requirement 2016-06-01 00:44:11 +02:00
Daniel Saukel
0791008ea4 Finish sign scripts. Closes #48 2016-06-01 00:44:11 +02:00
Daniel Saukel
569ddf5a8a Added script signs (untested) 2016-06-01 00:44:11 +02:00
Daniel Saukel
3ca7017664 Make DSign#getGame() accessible pre ready 2016-06-01 00:44:11 +02:00
Daniel Saukel
ab40ea726f Meh 2016-06-01 00:44:11 +02:00
Daniel Saukel
34226a5568 #48: Ignore case to compare 2016-06-01 00:44:11 +02:00
Daniel Saukel
1b7842ea80 #48: Script system for mobs and classes 2016-06-01 00:44:11 +02:00
Daniel Saukel
3896e14ef4 Send game announcement only to listed worlds 2016-06-01 00:44:11 +02:00
Daniel Saukel
328e28c254 Move announcer task initialization to main class 2016-06-01 00:44:11 +02:00
Daniel Saukel
b7bc91fd68 Move announcer task initialization to main class 2016-06-01 00:44:11 +02:00
Daniel Saukel
a227d8628d #40 Basic game announcements 2016-06-01 00:44:11 +02:00
Daniel Saukel
70b4d16be5 #61: Some fixes 2016-06-01 00:44:11 +02:00
Daniel Saukel
a4f04ab92b Fix /dxl leave NPE 2016-06-01 00:44:11 +02:00
Daniel Saukel
02e738e840 NPE fixes 2016-06-01 00:44:11 +02:00
Daniel Saukel
231372956d #61: Use GameRules instead of WorldConfig 2016-06-01 00:44:11 +02:00
Daniel Saukel
ffde4f6c8b #61 Added central GameRules class 
Not implemented and tested yet!
 2016-06-01 00:44:11 +02:00
Daniel Saukel
6e0d4ef9b8 Permission bridge; resolves #42 
Includes some fixes
 2016-06-01 00:44:11 +02:00
Daniel Saukel
6dd6133978 Finished player handling rewrite. Resolves #63 2016-06-01 00:44:11 +02:00
Sn0wStorm
30d60e9ea2 Added maxDungeons config option 2016-05-31 22:47:21 +02:00
Sn0wStorm
1b6ed7432a Fix NPE in RedstoneSign 2016-05-31 22:10:15 +02:00
Sn0wStorm
6c6c9c4b59 Quickfix ConcModExc when using many Triggersigns 2016-05-31 22:09:16 +02:00
Sn0wStorm
48b735791f Fix All Dungeons being ended 
When triggering the End Sign with Redstone etc
 2016-05-31 22:07:33 +02:00
Daniel Saukel
6b70e71abb Use double to store health 2016-05-22 20:30:06 +02:00
Daniel Saukel
f266f00412 Fix DGroup dungeon entering issues 2016-05-15 20:56:36 +02:00
Daniel Saukel
1f2791792b Fix respawn task console errors 2016-05-15 19:31:34 +02:00
Daniel Saukel
f01a4411a5 Deny some abusable group commands while playing 2016-05-15 18:50:22 +02:00
Daniel Saukel
62781f9f88 Fix respawn task console errors 2016-05-15 18:49:20 +02:00
Daniel Saukel
2604f6c8db Fix lives command; compile against BRCommons 0.5.2 2016-05-10 15:12:16 +02:00
Daniel Saukel
ceace09bc7 Some event / test plugin / misc fixes 2016-05-06 18:12:26 +02:00
Daniel Saukel
c4243232f0 Fix /dxl group create 2016-05-06 16:11:26 +02:00
Daniel Saukel
5a3a77cabf Call events properly 2016-05-06 15:28:19 +02:00
Daniel Saukel
5699cc142b Fix #62 2016-05-05 20:46:41 +02:00
Daniel Saukel
cac3e3de39 Minor method naming changes 2016-05-05 20:46:08 +02:00
Daniel Saukel
d5415955c5 Map creation with a map name in use is now forbidden 2016-05-05 14:29:35 +02:00
Daniel Saukel
147588967a Code cleanup 2016-05-05 14:13:28 +02:00
Daniel Saukel
4f43db7390 Fix NPE on interact while creating portal 2016-05-04 21:22:52 +02:00
Daniel Saukel
bcd931c2fe Update to BRCommons 0.5.1 2016-05-02 21:48:39 +02:00
Daniel Saukel
601e0cb33e Fix #59 2016-05-02 00:17:14 +02:00
Daniel Saukel
c0a39bc533 Added experimental support for Citizens 2016-05-01 00:20:44 +02:00
Daniel Saukel
e34d5218dc New external mob system 2016-04-30 01:28:11 +02:00
Daniel Saukel
02317cc208 Move game.GameChest => reward.RewardChest 2016-04-29 22:06:33 +02:00
Daniel Saukel
7cbe7f44bb Move DLootInventory to reward package 2016-04-29 22:01:25 +02:00
Daniel Saukel
9ee1e56ddf Create DPlayer for all players on game start 2016-04-29 21:54:57 +02:00
Daniel Saukel
8cbbe09265 Use /mythicmobs instead of /mm 2016-04-29 21:54:25 +02:00
Daniel Saukel
394080da34 Fixed some reward bugs 2016-04-29 21:11:00 +02:00
Daniel Saukel
5e2c9ff601 Fixed GameSign updating when group is deleted 2016-04-29 21:10:16 +02:00
Daniel Saukel
eed8427eb1 Fixed check for permissions not in the enum 2016-04-29 21:08:42 +02:00
Daniel Saukel
0ccbc58be1 New permission system 2016-04-29 16:42:52 +02:00
Daniel Saukel
4737441f9b Use seconds instead of ticks in the config 2016-04-29 15:46:12 +02:00
Daniel Saukel
cdb18b5ae6 Secure Mode 2016-04-29 15:30:57 +02:00
Daniel Saukel
63ffd6a3f8 Use Message util by BRCommons 2016-04-29 01:24:59 +02:00
Daniel Saukel
c1415d054e Fixed group command 2016-04-28 22:41:51 +02:00
Daniel Saukel
2d4e870d65 Added enter command 2016-04-28 22:41:14 +02:00
Daniel Saukel
1cdc78dda3 Fix #52 2016-04-28 00:03:25 +02:00
Daniel Saukel
43e6a04da1 Fixed MythicMobs spawn amount and interval 2016-04-27 23:22:10 +02:00
Daniel Saukel
0caad8f0f4 Fixed MythicMobs not recognized as DMobs 2016-04-27 14:11:36 +02:00
Daniel Saukel
df806d1520 Added ProgressTrigger 2016-04-26 22:20:24 +02:00
Daniel Saukel
53ef4f2280 Added mob waves and the wave trigger 
Still needs a trigger to trigger other signs
 2016-04-26 20:44:14 +02:00
Daniel Saukel
bac30d3dbb Added Metrics (BRCommons 0.4) 2016-04-24 17:19:09 +02:00
Daniel Saukel
c275b9df35 Move worlds to a new package 2016-04-24 16:24:20 +02:00
Daniel Saukel
ed0e32d9eb Added Time is Running mode 2016-04-24 01:35:39 +02:00