JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,487 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

12158 Commits

Author SHA1 Message Date
Sam 742d849b44 SSM Update 
- Also includes February PPC cosmetic
 2018-01-26 14:03:38 -05:00
Alexander Meech 3f3cc02f11 Fix a typo 2018-01-26 01:34:29 -05:00
Sam 440ff7feeb Stop lobbies being night 2018-01-26 01:34:29 -05:00
Sam a577e645d2 Shorten constructors 2018-01-26 01:34:29 -05:00
Sam 947e388d05 Modify chest loot 2018-01-26 01:34:29 -05:00
Sam c0dd95e085 Thanks git 2018-01-26 01:34:29 -05:00
Sam 5668a8f7d1 Stop fire affecting teammates 2018-01-26 01:34:29 -05:00
Sam d267c15845 Fix GameSummary showing an incorrect amout of shards 2018-01-26 01:34:29 -05:00
Sam 248c109627 Fix winstreak sql 2018-01-26 01:34:29 -05:00
Sam 8a77f53314 Fixed a couple of bugs 2018-01-26 01:34:29 -05:00
Sam 84fddb953e Revert "Implement an OP version of cake wars just for fun" 
This reverts commit 32c2b9456f9e4a2d0954f6805427e483a8d5187e.
 2018-01-26 01:34:29 -05:00
Sam 5152c07fa3 Fix team upgrades not applying 2018-01-26 01:34:29 -05:00
Sam cad557d1a2 Implement an OP version of cake wars just for fun 2018-01-26 01:34:29 -05:00
Sam 52ffd1cbf0 All the new shiny items and changes 2018-01-26 01:34:29 -05:00
Sam 962be63970 Skywars hotfix 2018-01-26 01:34:29 -05:00
Sam 85c721bb93 Change Bulders's passive 2018-01-26 01:34:29 -05:00
Sam a9d4e3e62c Reduce the cooldown/price of ender pearls 2018-01-26 01:34:29 -05:00
Sam db30e8757b Give Slow balls a cool name 2018-01-26 01:34:29 -05:00
Sam 3ac5c230c0 Fixed issues that arrised in testing 2018-01-26 01:34:29 -05:00
Sam 46b859ae8f Implement a Bat-Anticamping system 2018-01-26 01:34:29 -05:00
Sam 361b6c57ec Reduce the knockback of frosting's snowballs by 50% 2018-01-26 01:34:29 -05:00
Alexander Meech 127be0f387
Actually give support staff access to the checkOwnsPackage command @spencer 2018-01-24 22:43:18 -05:00
AlexTheCoder e23c3f6600 Increment old stats table for ONLY pre-existing stats to solve value cap issue 2018-01-22 01:18:16 -05:00
Sam edca456e42 Disable Christmas words for DMT and MB 2018-01-17 19:44:20 -05:00
Sam 2a1124b605 Remove the incorrect lore for the rainbow set 2018-01-17 19:44:20 -05:00
Sam 739d26f0e4 Don't default to the achievement gem reward for level ups 2018-01-17 19:44:20 -05:00
Sam a8c852e80d Enable scaffold notifications 2018-01-17 19:44:20 -05:00
Sam 42ae60c894 Fix bridges and skywars lagging during the pregame lobby 2018-01-17 19:43:28 -05:00
Sam edc1f5a9fd Fix DOUBLE SPACE 2018-01-17 19:36:22 -05:00
Sam be7ca772f2 Throwing TNT -> Throwable TNT 2018-01-17 19:36:22 -05:00
Sam 9116d4e1c9 SPARKY!!!! 2018-01-17 19:36:22 -05:00
Sam 35029bb33b Update kit descriptions to reflect changes 2018-01-17 19:36:22 -05:00
Sam 7f6537773b Readd soul sand 2018-01-17 19:36:22 -05:00
Sam f02d11575b Use the right enchantment types 2018-01-17 19:36:22 -05:00
Sam 7c533df0a5 Make throwable tnt track the damager 2018-01-17 19:36:22 -05:00
Sam 6471e00af5 Oh come on git 2018-01-17 19:36:22 -05:00
Sam ba2eeca97d Ensure achievements are tracked 2018-01-17 19:36:22 -05:00
Sam f11f95a3d7 Fix up more issues from testing 2018-01-17 19:36:22 -05:00
Sam 35c932048f Fix issues found in testing 2018-01-17 19:36:22 -05:00
Sam 5252d79c5f Improve the scoreboard 2018-01-17 19:36:22 -05:00
Sam 4367629898 I m p o r t s 2018-01-17 19:36:22 -05:00
Sam 8b471c1efe Remove pointless method 2018-01-17 19:36:22 -05:00
Sam 72b0524528 Remove debug messages 2018-01-17 19:36:22 -05:00
Sam 44117107c1 Prevent players moving skill items out of their inventory 2018-01-17 19:36:22 -05:00
Sam 538784f8f8 Add a scoreboard 2018-01-17 19:36:22 -05:00
Sam 60cdae5c04 Move perks into SkywarsPerks for less copied code 2018-01-17 19:36:22 -05:00
Sam e5a5b87abc Fix all the issues with chests 2018-01-17 19:36:22 -05:00
Sam 54a605de5b Finish up new generators 2018-01-17 19:36:22 -05:00
Sam 0934239e0c More s k y w a r s 2018-01-17 19:36:22 -05:00
Sam 0aef15992a Modulise Zombie Guardians 2018-01-17 19:36:22 -05:00
Sam 266d86e3a1 Modulise map crumble 2018-01-17 19:36:22 -05:00
Sam 7338f20d81 Disable all the christmas stuff 2018-01-13 19:15:41 -05:00
Spencer 76eb530b5f Use a Pair<Vector,String> to allow worlds to unload while they are stored in TP history 2018-01-13 19:08:49 -05:00
Spencer f54b6606ab Actually add fly speed command 2018-01-13 19:08:49 -05:00
Spencer 91d4f1526e Set metadata on all leaves to prevent them from decaying 2018-01-13 19:08:49 -05:00
Spencer ffc019eb8c Finish ListCommand changes 2018-01-13 19:08:49 -05:00
Spencer af3328f6c0 add GameType#getAllMapNames 2018-01-13 19:08:49 -05:00
Spencer 9707b46f50 Set players to creative and flying on join 2018-01-13 19:08:49 -05:00
Spencer dcafcbef76 Use getWorldFromName in MapCommand and Back when needed 2018-01-13 19:08:49 -05:00
Spencer 98f1bd151e Return true in MapInfoCommand 2018-01-13 19:08:49 -05:00
Spencer 8e43b4506c add MapParser#gerWorldFromName 2018-01-13 19:08:49 -05:00
Spencer 6bfe49d894 Add more info to the time command 2018-01-13 19:08:49 -05:00
Spencer a68f4fd65c Fix top command only teleporting to the next air gap 2018-01-13 19:08:49 -05:00
Spencer dfc6e12682 Track teleports for /map, /create, and /hub 2018-01-13 19:08:49 -05:00
Spencer 46eadf1b70 Add GameType#getMapNames (to be used later in ListCommand) 2018-01-13 19:08:49 -05:00
Spencer 1a1a52c0da add MapData#sendInfo and /mapinfo (alias /info) 2018-01-13 19:08:49 -05:00
Spencer 57e22e9d24 Rename /info to /gameinfo 2018-01-13 19:08:49 -05:00
Spencer ca9b1cb490 Don't require MapParser in constructors of Teleport commands 2018-01-13 19:08:49 -05:00
Spencer 069ee177eb Add TopCommand 2018-01-13 19:08:49 -05:00
Spencer 1e3648358b TimeCommand for relative player time 2018-01-13 19:08:49 -05:00
Spencer 99f3dd1805 TeleportManager, TeleportCommand and BackCommand (replaces EventModule's /tp) 2018-01-13 19:08:49 -05:00
Spencer bda5813c9c Add FlySpeedCommand to replace EventModule's 2018-01-13 19:08:49 -05:00
Spencer 740c547914 Add ParseCommand for arbitrary distance 2018-01-13 19:08:49 -05:00
Alexander Meech f20c53b8cb Update website access password 2018-01-12 06:19:31 -05:00
Alexander Meech 854ca9e62c Revert change to botspam causing false bans 2018-01-12 06:19:31 -05:00
ArcticZeroo 0f1b512dac reapply issue is fixed, remove debug 2018-01-10 11:15:40 -05:00
ArcticZeroo 79f0355288 Fix punish expiration, and possibly invalid reapply times 2018-01-10 11:15:40 -05:00
ArcticZeroo 4e9ac86e9f Remove explicit generics in ShopPageBase 2018-01-10 11:15:40 -05:00
ArcticZeroo d8f7a998ef Change botspam to ignore symbols 2018-01-10 11:15:40 -05:00
ArcticZeroo 2b00363bfc Return in InventoryManager#getItem instead of iterating over the whole set 2018-01-10 11:15:40 -05:00
ArcticZeroo 4d3a5e8756 Use ClientInventory#addItem 2018-01-10 11:15:40 -05:00
ArcticZeroo 5c80b002b1 Temporary debug yay 2018-01-10 11:15:40 -05:00
ArcticZeroo 77687ea84b Remove TypeWars from the MPS menu (it's crashing players) 2018-01-10 11:15:40 -05:00
ArcticZeroo 3bd986e101 set player gamemode on respawn in Game 2018-01-10 11:15:40 -05:00
ArcticZeroo 6019104146 Longer quest lore 2018-01-10 11:15:40 -05:00
ArcticZeroo f470071ca0 Update item count when giving items to players in GiveItemPage 2018-01-10 11:15:40 -05:00
ArcticZeroo b1f6e5c06c Change rune amplifier icon to nether star 2018-01-10 11:15:40 -05:00
ArcticZeroo 9307898d84 Fix rank bonus page error when user has <6 entries 2018-01-10 11:15:40 -05:00
Spencer dc3c4d6850 Use _donor in SupportPage 2018-01-07 11:26:47 -05:00
Spencer d10920329d Requested PR changes 2018-01-07 11:26:47 -05:00
Spencer e7b67ae7d6 Remove openPageAsync and clean up BonusData on close 2018-01-07 11:26:47 -05:00
Alexander Meech 7a431350a1 Fix formatting and grammar 2018-01-07 11:26:47 -05:00
Alexander Meech 6ac9fd1eed Fix formatting 2018-01-07 11:26:47 -05:00
Spencer 675594c8bd Readd CheckOwnsPackageCommand to CustomerSupport, getter for BonusRepository 2018-01-07 11:26:47 -05:00
Spencer 058c75206e Add carl spinner tickets to chest page 2018-01-07 11:26:47 -05:00
Spencer b22fe90afe Add whether clans banners are enabled or not in ClansPackage 2018-01-07 11:26:47 -05:00
Spencer 9703b10714 add SupportPage#ownsSalesPackage and SupportPage#getOwnedCount 2018-01-07 11:26:47 -05:00
Spencer 45de19163f make pet menu refresh instantly 2018-01-07 11:26:47 -05:00
Spencer 09cc258d9b Add confirmation menu to apply kits button 2018-01-07 11:26:47 -05:00
Spencer 56122d0b9b Add support for custom lower and upper bounds in GiveItemPage, do that in Chest 2018-01-07 11:26:47 -05:00
Spencer 1fbd8031ed use BonusRepository, readd salesmanager, add Rank Bonus log at bottom of the menu 2018-01-07 11:26:47 -05:00
Spencer 5269a54001 add Rank Bonus log at bottom of the menu 2018-01-07 11:26:47 -05:00
Spencer f4133217be delete DisplayPackageCommand 2018-01-07 11:26:47 -05:00
Spencer 29162b22d9 Add back checkownspackage but with slightly better handling @alex 2018-01-07 11:26:47 -05:00
Spencer b5aca834fa Bring back /sales :( 2018-01-07 11:26:47 -05:00
Spencer c5106f8042 add data to SupportPackagePage ItemBuilder 2018-01-07 11:26:47 -05:00
Spencer e15a004646 Add Davy Jones' booty item 2018-01-07 11:26:47 -05:00
Spencer 9fa37824fe Fix InventoryManager instantiation, remove 2fa (not needed on prod) 2018-01-07 11:26:47 -05:00
Spencer 8d0220b0cc Add 2fa to StaffServer 2018-01-07 11:26:47 -05:00
Spencer 8afb120173 Remove even more things 2018-01-07 11:26:47 -05:00
Spencer 0a1e1e6119 Remove all the old stuff in StaffServer, optimize imports 2018-01-07 11:26:47 -05:00
Spencer 5c6a9ea879 Don't allow support to set ranks for admin+ or content users 2018-01-07 11:26:47 -05:00
Spencer 14daa939e3 Add support for whether a player owns a given pet 2018-01-07 11:26:47 -05:00
Spencer 9f134b5772 Number currency buttons in order of increasing value 2018-01-07 11:26:47 -05:00
Spencer 876ba8fb1f add addToItemLores method into SupportPackagePage instead 2018-01-07 11:26:47 -05:00
Spencer 413948bf38 Actually use the new GivePackagePage in MiscPackagePage 2018-01-07 11:26:47 -05:00
Spencer 94a525c5b4 Use new GiveItemPage in GiveChestPage,add GivePackagePage 2018-01-07 11:26:47 -05:00
Spencer 37766a8a3b Abstract GiveChestPage to SupportGiveItemPage 2018-01-07 11:26:47 -05:00
Spencer 1094cf997e Make buttons a 3x3 grid instead of a weird pyramid 2018-01-07 11:26:47 -05:00
Spencer 41e49e3649 Add received info to ClansPackagePage 2018-01-07 11:26:47 -05:00
Spencer 2e79bb3d7f Add OneTimePackagePage and ClansPackagePage 2018-01-07 11:26:47 -05:00
Spencer 468930a35e add giveUnkownSalesPackage method to SupportPage 2018-01-07 11:26:47 -05:00
Spencer 3ca0adfeda add SupportPackagePage to make One-Time Package pages easily 2018-01-07 11:26:47 -05:00
Spencer d53222e243 add PetPage and CustomerSupport#getPetRepository 2018-01-07 11:26:47 -05:00
Spencer cf515036f7 Add the ability for support to reset ranks to default 2018-01-07 11:26:47 -05:00
Spencer 17a11a63b6 Add buttons for support to give PPC subscriptions 2018-01-07 11:26:47 -05:00
Spencer 3653eb36df Fix NPE in ChestPage 2018-01-07 11:26:47 -05:00
Spencer 3fd8a5bb35 Put ALL treasures in the menu so support can award chests even if they don't have any 2018-01-07 11:26:47 -05:00
Spencer e5e9ee9e46 Add RankListPage 2018-01-07 11:26:47 -05:00
Spencer 0e9bbd7176 Add functionality to PowerPlayData 2018-01-07 11:26:47 -05:00
Spencer 992a6aafe9 Whoops, actually commit shard changes to chest page 2018-01-07 11:26:47 -05:00
Spencer c26831614c Fixes to RankBonusPage 2018-01-07 11:26:47 -05:00
Spencer f9263b38be add predicate to getPackageOwnership, add shard purchases to chest page 2018-01-07 11:26:47 -05:00
Spencer 0cebc6e494 add PPC methods to SupportShop 2018-01-07 11:26:47 -05:00
Spencer ed37174e94 Change MultiPageManager to use BiConsumer/BiPredicate 2018-01-07 11:26:47 -05:00
Spencer 5e5762d6e7 add PowerplayPage 2018-01-07 11:26:47 -05:00
Spencer c8a1bed01c add LinkedTemporaryItem to link Player->K->V without making 2 maps each time 2018-01-07 11:26:47 -05:00
Spencer b5ef5d9011 Add RankBonusPage to home, minor visual changes, use MultiPageManager in ChestPage 2018-01-07 11:26:47 -05:00
Spencer 100df70157 Make RankBonusPage work 2018-01-07 11:26:47 -05:00
Spencer 8820e33d09 Use Calendar in BonusEntry 2018-01-07 11:26:47 -05:00
Spencer db66e166fa Add Fancy Shmancy MultiPageManager 2018-01-07 11:26:47 -05:00
Spencer 0664ea0884 Redo the bonus handling code because I don't like it 2018-01-07 11:26:47 -05:00
Spencer ce946f7927 Commit RankBonusPage so I can commit quest stuff while I figure out what the cust repo is doing 2018-01-07 11:26:47 -05:00
Spencer e81a36e135 Put a scary button when instantiation fails so support can notify devs 2018-01-07 11:26:47 -05:00
Spencer fa2362811c Move stuff around, minor visual changes in CurrencyPage 2018-01-07 11:26:47 -05:00
Spencer cba6669339 Rename Customer Support module to Support 2018-01-07 11:26:47 -05:00
Spencer 1f3e465467 rename CheckCommand's file again since git is being bad 2018-01-07 11:26:47 -05:00
Spencer 40281ea407 Move old CheckCommand 2018-01-07 11:26:47 -05:00
Spencer 2fc792cf50 Allow getting of managers in CustomerSupport, add InventoryManager 2018-01-07 11:26:47 -05:00
Spencer 248472a5d3 Add SupportHomePage + reflective buildPageButton method 2018-01-07 11:26:47 -05:00
Spencer 18ad75582a Add SupportCurrencyPage and optional color in Currency.getString 2018-01-07 11:26:47 -05:00
Spencer 1e610f3dac add SupportChestPage and SupportGiveChestPage 2018-01-07 11:26:47 -05:00
Spencer 5ffb9a2ae7 Create SupportShop and common SupportPage 2018-01-07 11:26:47 -05:00
Alexander Meech 31aae26bf9 Remove extra kit command 2018-01-07 11:24:30 -05:00
AlexTheCoder 877b5333cb Remove unnecessary empty end line 2018-01-07 06:23:40 -05:00
Alexander Meech 4db3ab12f1 Remove unnecessary AtomicReference usage 2018-01-07 06:23:40 -05:00
Alexander Meech 57b49eab50 Fix bedrock check to be less sensitive 2018-01-07 06:23:40 -05:00
Alexander Meech 1d02f9f149 Fix permission heritability 2018-01-07 06:23:40 -05:00
Spencer 5208424a60 Change Clans energy icon to wood sword, cancel placing of bedrock 2018-01-07 06:23:40 -05:00
Spencer 9f8cc4f372 Actually open the page 2018-01-07 06:23:40 -05:00
Spencer bc608e8670 Add confirmation menu when user is disguised 2018-01-07 06:23:40 -05:00
Spencer 468c012639 Actually call method for disguise icon 2018-01-07 06:23:40 -05:00
Spencer 6517fe382f Add TM to remove bypass and add player name to the skull 2018-01-07 06:23:40 -05:00
Spencer 3ca434fcf6 Use UtilSkull in PunishStaffPage 2018-01-07 06:23:40 -05:00
Spencer 27453af867 Add HistoryCommand, and working history button in /p 2018-01-07 06:23:40 -05:00
Spencer c85b92f52b Abstract common punish page methods to PunishPage 2018-01-07 06:23:40 -05:00
Spencer d703902606 add Punishment Reapply perm, change Report Ban to regular book 2018-01-07 06:23:40 -05:00
AlexTheCoder 7902bacb04 Fixed merge conflicts 2018-01-07 06:23:40 -05:00
Spencer 738253690e add isBan to Category enum 2018-01-07 06:23:40 -05:00
Spencer 81619a6886 add suport for custom ConfirmationPage names 2018-01-07 06:23:40 -05:00
AlexTheCoder 7b955dad16 Fixed merge conflicts 2018-01-07 06:23:40 -05:00
Spencer da5d58fcbd Add PunishShop and get PunishCommand to use it 2018-01-07 06:23:40 -05:00
Spencer f52af3f87f Get rid of PunishTrackUtil 2018-01-07 06:23:40 -05:00
Spencer dc293cd0fe Add PUNISHMENT_UI LineFormat 2018-01-07 06:23:40 -05:00
Spencer e13eee5a5f Add report ban and bypass remove confirmation perms, for rc and fn respectively (and admin+) 2018-01-07 06:23:40 -05:00
Spencer 21af431e9e Add RC, FN ranks 2018-01-07 06:23:40 -05:00
Spencer 1a54911231 add ShopPageBase#getSlot to get a slot from row and column offset 2018-01-07 06:23:40 -05:00
Spencer c4f51efb4d Make UtilTime#convertString treat all <= -1 as Permanent instead of == -1 2018-01-07 06:23:40 -05:00
Spencer f6e0174c70 Add name, icon, max sev, and permission to Category enum 2018-01-07 06:23:40 -05:00
Alexander Meech 8a16b419c4 Re-enable Rainbow Cosmetic Set 2018-01-07 06:15:36 -05:00
Alexander Meech 9d0eca5031 Fix some formatting 2018-01-07 04:55:55 -05:00
Spencer 8a389a13a2 Add an overcomplicated system to prevent Necromancer Skeletons from spawning in blocks 2018-01-07 04:55:55 -05:00
Spencer 4cd3fa5325 Change line length to 48 2018-01-07 04:55:55 -05:00
Spencer 3b844b02af Add UtilText.splitLine(String, int) 2018-01-07 04:55:55 -05:00
Spencer 0ea229a8b4 Split quest tasks in the lore if they get too long 2018-01-07 04:55:55 -05:00
Spencer 010d31bd9e Put hiders in adventure mode 2018-01-07 04:55:55 -05:00
Spencer 7bbfe0794b Add /v alias for vanish 2018-01-07 04:55:55 -05:00
Spencer 80793702c9 Remove scavenger kit and extra TNT message 2018-01-07 04:55:55 -05:00
Spencer 71efe0503b Color names of report buttons properly 2018-01-07 04:55:55 -05:00
Spencer b0c4a86790 Change report menu icons 2018-01-07 04:55:55 -05:00
Spencer a2e0ca19ba Give exp in item breakdown, reduce cooldown 2018-01-07 04:55:55 -05:00
Spencer be72f7ea90 Fix HE grenades doing damage to teammates if the thrower died 2018-01-07 04:55:55 -05:00
Spencer 11e6660809 Give up trying to fix chest location stuff, arcade is a fickle creature 2018-01-07 04:55:55 -05:00
Spencer 9c73ca7f75 Disable the HE grenade knockback 2018-01-07 04:55:55 -05:00
Spencer fd369bf8ea Move /kit to Game 2018-01-07 04:55:55 -05:00
Spencer 81d7cb144b Allow cooked versions of foods to be broken down 2018-01-07 04:55:55 -05:00
Spencer 0bb75c3a8f Add Game#PlayerGameMode which is set in PlayerPrepareTeleportEvent, and UtilPlayer#getProtocolVersion 2018-01-07 04:55:55 -05:00
Spencer c31e387b2a Let Throwing TNT be thrown with Right Click, prevent 2x use from TNT/Compass 2018-01-07 04:55:55 -05:00
Spencer d1c147b025 Add Scavenger Kit to SG 2018-01-07 04:55:55 -05:00
Spencer 087640ce1a Don't let destructor pearls work on mid chests in BR 2018-01-07 04:55:55 -05:00