Commit Graph

10827 Commits

Author SHA1 Message Date
cnr 68084c5cf0 Insert linebreaks in mapper + mapdev descriptions 2017-06-09 02:43:34 -05:00
cnr d226a4e710 Remove Gem Fountain and open brawl on weekends 2017-06-09 00:14:49 -05:00
AlexTheCoder 87966ddedd Season 3 2017-06-08 20:20:10 -04:00
AlexTheCoder e7174a0e4e Add an item unbreakable checker to UtilItem 2017-06-08 20:19:12 -04:00
AlexTheCoder 986d4f3dcc Properly restrict moderation staff testrank access 2017-06-08 20:15:41 -04:00
AlexTheCoder ecd9812f0c Properly return empty value in ItemStackFactory 2017-06-08 20:12:44 -04:00
cnr 3c3cffb001 Add MAPPER rank and modify BUILDER description 2017-06-08 18:53:37 -05:00
Sam 79b983536d While Withered, prevent regeneration 2017-06-08 22:55:17 +01:00
Sam e94ab9598a New Heroes 2017-06-08 22:43:50 +01:00
Sam 4fb4c2c865 Fix merge imports 2017-06-08 16:11:25 +01:00
Sam 206dd56d14 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 16:10:49 +01:00
Sam 9844ca338a Complete Biff 2017-06-08 16:09:32 +01:00
Sam a767135ce0 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-08 13:08:54 +01:00
Graphica 8138b5d241 Fix Bob Ross morph carpets not disappearing 2017-06-08 00:49:40 -05:00
Graphica 4628af6e81 Call treasure start event after teleporting the player 2017-06-08 00:49:33 -05:00
Sam 1d64bb63c4 Add a check to prevent a possible duplication bug 2017-06-08 02:18:57 +01:00
Sam b59e57dfb6 Fixed Players not being given their Gem Hunters rewards for the final time! 2017-06-08 02:10:24 +01:00
Sam 8c821af9de Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-08 02:09:24 +01:00
Sam 044927252c More changes! 2017-06-08 01:55:07 +01:00
cnr 7cc7769378 Send gem hunters players to normal hub upon cashout 2017-06-07 18:26:56 -05:00
Kenny Goodin 83f6b4fa1d Fill in actual quest rarity weights 2017-06-07 02:18:37 -05:00
Sam 697d4a11ed Fix the Quest achievement looking for the wrong stat 2017-06-06 23:00:17 +01:00
Sam a800fee08c Testing session changes 2017-06-06 22:59:40 +01:00
Sam 16f9364772 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-06 19:31:20 +01:00
Sam 8f87578a57 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-06 19:28:54 +01:00
Sam a63399943d Leaderboards and UFO world event 2017-06-06 19:28:41 +01:00
Sam 4a91d2821b Achievements 2017-06-05 20:57:30 +01:00
cnr 629ced569c Fix treasure location comparison between worlds 2017-06-05 11:52:44 -05:00
Sam a3fd81f763 Fix Biff's skills not cleaning up 2017-06-04 10:52:43 +01:00
cnr 347cddccc0 Use UUID in enjin commands instead of name 2017-06-03 14:22:04 -05:00
Sam e094446be4 Add biff to the hero list 2017-06-03 15:33:26 +01:00
Sam dbde734e76 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-03 14:54:43 +01:00
Sam c3f3d71610 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/gem-hunters 2017-06-03 14:53:34 +01:00
Sam 674253c89a Gen Hunters Title 2017-06-03 14:53:33 +01:00
Sam 092c5db6b2 Merge remote-tracking branch 'refs/remotes/origin/update/gem-hunters-11-5' into update/gem-hunters 2017-06-02 20:10:51 +01:00
Sam 7e05cbfa87 Biff 2017-06-02 18:43:07 +01:00
Sarah 844052c0c6 Async db calls... 2017-06-02 07:05:23 -05:00
Sarah 84cb803c66 Async db calls... 2017-06-02 13:22:12 +02:00
Alexander Meech 62d15eeee1 Make podium generation setting based on map rather than hardcoded server group 2017-06-02 02:42:21 -05:00
Dan Mulloy abaaaebd43 Use "Coming soon!" instead of empty string 2017-06-02 00:04:47 -05:00
Dan Mulloy 414573c18d Make Carl more robust, print better warnings when he breaks 2017-06-02 00:02:00 -05:00
cnr 2701476ea8 Merge branch 'feature/quests' into develop 2017-06-01 21:47:38 -05:00
Sarah 73897e407b Add fix for new game lobbies 2017-06-02 03:41:06 +02:00
Sarah 4b54232514 make slime not go small 2017-06-02 02:21:13 +02:00
Sarah 0c6fcba21f Improve NPC visuals 2017-06-02 02:00:20 +02:00
cnr b6a1a3a054 Only request quests once on startup 2017-06-01 17:29:42 -05:00
Kenny Goodin cea9b00b68 Subscribe to quest request channel before requesting from daemon 2017-06-01 18:27:02 -04:00
cnr 60a696a82e Subscribe to response channel before requesting quests 2017-06-01 17:25:30 -05:00
Sarah b823fc62c9 Fix quests not disappearing after completing 2017-06-02 00:03:34 +02:00
Sarah aaf4be1dc2 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:59:53 +02:00
Sarah 9b64f5da66 change quest name to "Mineplex Mission" 2017-06-01 20:59:35 +02:00
Kenny Goodin 2f1f7a1e7d Debug quest supplier 2017-06-01 14:59:22 -04:00
Sarah 9bfa586f61 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 20:16:08 +02:00
Sarah 3c5f8bf72d add names to quests in the stats gui, add different reward colors, properly remove "next Page" and "Previous Page" buttons from stats page 2017-06-01 20:15:39 +02:00
Sam 66b89d6e64 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-06-01 13:01:48 +01:00
AlexTheCoder e94201409b Finalize raid system and implement Charles Witherton Raid 2017-06-01 02:16:12 -04:00
AlexTheCoder fdd48b51d4 Start work on raids 2017-06-01 02:16:12 -04:00
AlexTheCoder 9fcf718e65 Tweak dye boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder b1b12babf0 Slight fixes to boxes 2017-06-01 02:16:12 -04:00
AlexTheCoder 21759c35c9 Added boxes to clans and used lambda for mount gui 2017-06-01 02:16:12 -04:00
AlexTheCoder 03149fc49b Implement the iron wizard boss with tidied up code and the new world event api 2017-06-01 02:16:12 -04:00
AlexTheCoder 4e58fa1e6c Implement an arena manager for the specific bosses on the map 2017-06-01 02:16:12 -04:00
AlexTheCoder 77f13f9b4c Slightly improve boss worldevent api 2017-06-01 02:16:12 -04:00
AlexTheCoder a17b0c95bf Update existing command and api classes to support new worldevent changes 2017-06-01 02:16:12 -04:00
AlexTheCoder b0297e404c Deactivate events lacking implementation 2017-06-01 02:16:12 -04:00
AlexTheCoder 3ea378110c Convert nether listener to spawn boss portals with the new boss event system 2017-06-01 02:16:12 -04:00
AlexTheCoder 150f1d1de9 Add implementation for managing world events 2017-06-01 02:16:12 -04:00
AlexTheCoder cff2ca5414 Implement a new worldevent api to better handle events in clans, and begin implementing the api in place of the old 2017-06-01 02:16:12 -04:00
AlexTheCoder b14ecdbe4f Fix outposts to not break if the clan has blank banner pattern layers 2017-06-01 02:16:12 -04:00
AlexTheCoder 8ea90eb914 Prevent breaking banners in zones the player does not have build access in 2017-06-01 02:16:12 -04:00
AlexTheCoder 9829527688 Remove armor stands causing memory leaks 2017-06-01 02:16:12 -04:00
AlexTheCoder c78ee51307 Add method for testing 2d squared distance 2017-06-01 02:16:12 -04:00
AlexTheCoder 2f0acc4a00 Block outposts being spawned in water causing them to break 2017-06-01 02:16:12 -04:00
AlexTheCoder 8c911426fd Slight UI improvements and made fall damage no longer count towards mount despawn hits 2017-06-01 02:16:12 -04:00
AlexTheCoder 3c4eee910f Finish implementation of Mounts, tidy up mount saving, implement mount GUIs 2017-06-01 02:16:12 -04:00
AlexTheCoder 264b7f86cf Implement mounts and remove legacy horse dismount code 2017-06-01 02:16:12 -04:00
AlexTheCoder 8c27c4349d Allow horses to be forcibly spawned but prevent them from naturally occurring 2017-06-01 02:16:12 -04:00
AlexTheCoder c6bd00a811 Make UtilEnt#GetMetadata actually return the field assigned to that metadata key and add a method to remove metadata from an entity 2017-06-01 02:16:12 -04:00
AlexTheCoder 76d5d3e896 More appropriately name fields in the CustomDamageEvent getDamagerPlayer method in order to be more understandable 2017-06-01 02:16:12 -04:00
AlexTheCoder 570355e41b Fix error runnables not being passed through even when intended to 2017-06-01 02:16:12 -04:00
AlexTheCoder 6d67a4f9f8 Fix null pointer causing console spam (SENTRY ISSUE 223503319) 2017-06-01 02:16:12 -04:00
AlexTheCoder 03d9032f82 Add backend system for saving/loading clans mounts with varied stats and skins 2017-06-01 02:16:12 -04:00
AlexTheCoder b7a566744c Formatting fix 2017-06-01 02:16:12 -04:00
AlexTheCoder cc1bb3cfe9 Make outposts utilize the Clan Banner of their owner 2017-06-01 02:16:12 -04:00
AlexTheCoder 2e04490001 Change nether miniboss rewards to drop crafting materials beyond diamonds and add the ability to drop set pieces 2017-06-01 02:16:12 -04:00
AlexTheCoder 48967b4a74 Block exploit allowing clans to make a lot of allies and then add members to disrupt the equation. Additionally, lower the maximum amount of allies per member 2017-06-01 02:16:12 -04:00
AlexTheCoder 35f2d42d08 Remove height limitations on planting crops 2017-06-01 02:16:12 -04:00
AlexTheCoder 1574d93d1b Re-implement the main clans tutorial 2017-06-01 02:16:12 -04:00
AlexTheCoder 08b89fbb4b Change farming shop prices 2017-06-01 02:16:12 -04:00
Alexander Meech 01e7dc85dd Merge branch 'develop' into feature/quests 2017-05-31 22:21:24 -04:00
cnr 921aaea5bd Disable Toggle check from the plugin side until tomorrow 2017-05-31 21:16:58 -05:00
Sam c34bf77dc9 More testing feedback 2017-06-01 00:55:33 +01:00
Sarah 738090bb30 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-06-01 00:34:38 +02:00
Sarah d7731d330c Do some visual adjustments, add back button to quest stats menu, remove quest from buy bar after completion 2017-06-01 00:34:21 +02:00
Kenny Goodin 1cf04592da Whoops, actually add the 'fail-safe' 2017-05-31 16:00:00 -04:00
Kenny Goodin 13ad590487 Reduce QuestDaemon log spam, add failsafe for when no active quests are loaded 2017-05-31 15:58:28 -04:00
Sarah c355015041 Merge branch 'feature/quests' of github.com:Mineplex-LLC/Minecraft-PC into feature/quests 2017-05-31 21:51:25 +02:00
Sarah 5c8e6d84b0 Add increment command, Questtrackers, change some visuals, allow Quests to have multiple required items 2017-05-31 21:51:04 +02:00
Sam 8a9e113389 Improvements to the targetting system 2017-05-31 17:09:08 +01:00
Sam 70eec9e38c Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:17:41 +01:00
Sam edfadde239 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-31 13:05:13 +01:00
Sam 0edd2c8947 Feedback from testing 2017-05-31 13:05:06 +01:00
Kenny Goodin ff12121926 Fix QuestDaemon command that didn't actually do anything 2017-05-31 02:35:16 -04:00
Kenny Goodin 028a4ecce3 Remove author tag 2017-05-31 02:15:23 -04:00
Kenny Goodin ffdd82c34e Ignore quests in QuestDaemon process that have a cost of -1 2017-05-31 02:02:30 -04:00
cnr 6e2d39035d Add Bob Ross morph to PPC for June 2017-05-30 22:50:41 -05:00
Graphica a87685eae0 Change color selector and put colors in order 2017-05-30 22:49:30 -05:00
Graphica cf8109b3bd Add method for detecting bottom slabs to UtilBlock 2017-05-30 22:49:30 -05:00
Graphica 9c48919e42 Reduce paint time down to 30 seconds 2017-05-30 22:49:30 -05:00
Graphica 6b2a99a881 Make quotes be activated with a shift click 2017-05-30 22:49:30 -05:00
Graphica a61c4cd816 Fix holograms not following players in 1.9+ 2017-05-30 22:49:30 -05:00
Graphica 98929f043f Make brush types varied and colored in player hotbars 2017-05-30 22:49:30 -05:00
Graphica 7baf3bad30 Clean up Hologram class code 2017-05-30 22:49:30 -05:00
Graphica 2c6112347a Add Bob Ross Morph 2017-05-30 22:49:30 -05:00
Kenny Goodin b139d0550b Periodically purge expired elements from recently seelected quests repo 2017-05-30 20:36:39 -04:00
AlexTheCoder 2fc423306b Add appropriate starter level for multi-tiered achievements with level names to fix incorrect array length 2017-05-29 22:49:23 -05:00
cnr b9af3a8dfb Sort CMA in the tab list next to Mod 2017-05-29 22:49:01 -05:00
Alexander Meech e501982712 Update cma scoreboard id 2017-05-29 22:48:25 -05:00
Alexander Meech f793539cc4 Allow cma to see freeze/unfreeze information 2017-05-29 22:48:25 -05:00
Alexander Meech 57f2f7b686 Give cma access to clans punishments 2017-05-29 22:48:25 -05:00
Alexander Meech 1adb4b8239 Give cma access to freeze 2017-05-29 22:48:25 -05:00
Alexander Meech cd8e805435 Give CMA access to unfreeze 2017-05-29 22:48:25 -05:00
Alexander Meech 2895397aec Implement CMA rank 2017-05-29 22:48:25 -05:00
cnr 1a59c050d3 Disable Alien Invasion event 2017-05-29 22:45:54 -05:00
cnr f1bad41e89 Revert "Enable double XP + gems + shards for the weekend"
This reverts commit aa271a1bd3.
2017-05-29 22:44:54 -05:00
Sam c3a80ed0cb Fix pumpkin king's death not being logged properly 2017-05-29 12:40:18 +01:00
Sam 9e9bfe79de Pumpkin king boss 2017-05-28 16:27:54 +01:00
Sam 911fd030f3 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-28 13:20:24 +01:00
cnr e51818c15d Reduce alien shard reward to 5 per hit and make lobbies nighttime 2017-05-28 02:08:17 -05:00
Sam 18197de7be Correct operator... 2017-05-27 18:24:51 +01:00
Sam 5bdcd3474f Only give the chest once 2017-05-27 18:23:53 +01:00
Sam b9ad85dd1e Pumpkin King boss 2017-05-27 18:19:14 +01:00
Sam ffa2a736ec Give players an omega chest for completing the event 2017-05-27 17:03:52 +01:00
Sam 8f2c84b842 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 16:46:20 +01:00
Sam 8e87b1d3e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-27 13:55:36 +01:00
Sam 7705bd34a3 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/aliens 2017-05-27 01:05:04 +01:00
Sam 27d9233566 While we're at it, change the easter egg achievement requirement 2017-05-27 01:05:02 +01:00
Sam 4d4988577e Use a more sensible method of awarding shards 2017-05-27 01:01:16 +01:00
Sam e3f678d71d Bugs 2017-05-27 00:56:38 +01:00
cnr aa271a1bd3 Enable double XP + gems + shards for the weekend 2017-05-26 18:20:27 -05:00
cnr 4a7ca75b24 Open UFO event for the weekend 2017-05-26 18:08:24 -05:00
Sam 36733e9918 Fix gametype imports 2017-05-26 18:37:35 +01:00
Sam d70cd38049 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-26 18:34:23 +01:00
Sam 5c8a36b024 Sigils bug fixes 2017-05-26 18:33:06 +01:00
cnr b46464babe Reduce UFO beam radius from 5 -> 3 blocks 2017-05-25 22:42:14 -05:00
cnr fbd39092f8 Add delay for should-start-invasion check 2017-05-25 04:47:35 -05:00
Sam 5ae32de83c Reduce the cooldown from 6 to 3 seconds 2017-05-24 21:05:58 -05:00
cnr fd1cd148cb Implement Alien Event service calls on Hub/Arcade 2017-05-24 20:52:24 -05:00
Sarah b7ba532568 Add quest stats page, make rewards be able to be items as well, fix some quest trackers, fix spelling mistakes 2017-05-25 00:40:41 +02:00
Sam a134c1da5c Sign off changes 2017-05-24 19:19:52 +01:00