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

12280 Commits

Author SHA1 Message Date
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
Spencer
64fc407c4e Change the icon for BH sheep to mutton to reduce block glitching 2018-01-07 04:55:55 -05:00
Alexander Meech
0c883fab3d Disable Christmas double xp bonus 2018-01-02 04:48:25 -05:00
Alexander Meech
f69fda3174 Disable Christmas double gem reward 2018-01-02 04:48:25 -05:00
Spencer
dd691284ec Add ImmediateKickAction for the disabled checks 2018-01-01 23:20:26 -05:00
Sam
b69ec7c87f Add a custom data point that allows maps to have custom time values 2018-01-01 23:13:47 -05:00
AlexTheCoder
738479b4ea Disable permanent bans for hacking offenses 2018-01-01 02:38:42 -05:00
AlexTheCoder
5e152e7f64 Disable anticheat banning for movement hacks and revert modification of bonus awarding to fix duplicate bonuses being given 2018-01-01 01:49:34 -05:00
Alexander Meech
9b39636d18
Bump anticheat version to 1.10 2017-12-30 03:23:09 -05:00
Sam
a5986e9d0f Update the frosting kit's description to reflect balance changes 2017-12-30 02:14:50 -05:00
Sam
01f82a7043 Prevent mobs from the Mob Bomb doing weird things like catching on 🔥 or 💣 2017-12-30 02:14:50 -05:00
Sam
9bd7cb18b2 Prevent snowballs from being dropped and moved to other inventories 2017-12-30 02:14:50 -05:00
AlexTheCoder
6c32247663 Patch Frosting Kit not being shown as the Cake Wars achievement reward 2017-12-29 02:35:23 -05:00
Spencer
3b0024f13b Appease the alex 2017-12-29 01:07:27 -05:00
Spencer
4ca80c755e More generifying (is that a word?) 2017-12-29 01:07:27 -05:00
Spencer
1ebec833e4 Alex is nitpicky about his generics 2017-12-29 01:07:27 -05:00
Spencer
dd40ebbff5 Fix an annoying quest NPE 2017-12-29 01:07:27 -05:00
Spencer
b699ef475d Braces in cubTargetCancel 2017-12-29 01:07:27 -05:00
Spencer
e20db10066 Braces in deathmatchTeleport 2017-12-29 01:07:27 -05:00
Spencer
af965d2a9b Braces in teleportUniform 2017-12-29 01:07:27 -05:00
Spencer
2fd85bb73d Use modulo in teleportUniform for cleaner wrapping 2017-12-29 01:07:27 -05:00
Spencer
56a8e03204 Use teleportUniform for deathmatchTeleport in teams 2017-12-29 01:07:27 -05:00
Spencer
04b7986da6 Fix styling of afk kick messages 2017-12-29 01:07:27 -05:00
Spencer
7f89863c6f Send afk kick message as a broadcast 2017-12-29 01:07:27 -05:00
Spencer
6ce5c577b8 Don't respawn the horse if the player no longer has the perk 2017-12-29 01:07:27 -05:00
Spencer
90b129dd64 Allow QA and Admin+ to force deathmatch in test servers 2017-12-29 01:07:27 -05:00
Spencer
f41e9a4e2c Use Manager.canHurt instead of team equality 2017-12-29 01:07:27 -05:00
Spencer
496d515972 Use team.getDyeColor to color wolf collars 2017-12-29 01:07:27 -05:00
Spencer
d47eb2367f Increase skeleton range before teleport 2017-12-29 01:07:27 -05:00
Spencer
0d13e6fa14 Teleport skeletons when they are very far from the owner 2017-12-29 01:07:27 -05:00
Spencer
bd26be8a21 Add GameTeam.getDyeColor 2017-12-29 01:07:27 -05:00
Spencer
3dd0bb3e1c Fix soups being used when players walk on pressure plates 2017-12-29 01:07:27 -05:00
Spencer
cc3ed60adc Color wolf collars based on team 2017-12-29 01:07:27 -05:00
Spencer
428713d56c Don't return if the wolf target is not a beasmaster owner 2017-12-29 01:07:27 -05:00
Spencer
0b40447802 Fix /game help only showing when players CANNOT use /game 2017-12-29 01:07:27 -05:00
Spencer
86604cc531 Use PunishClient#isMuted instead of MessageManager#isMuted in SnapshotPlugin 
Fixes muted message being sent twice, chiss why
 2017-12-29 01:07:27 -05:00
Spencer
1fa7f02a89 Fix destructor enderpearls teleporting players 2017-12-29 01:07:27 -05:00
Spencer
90500a723a cancel wolf targetting on teammates in SG 2017-12-29 01:07:27 -05:00
AlexTheCoder
1fc6936ad6 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
Spencer
e7d8596174 Re-enable blade vortex's usage on teammates via GI request 2017-12-29 01:07:27 -05:00
AlexTheCoder
c3e03b8bc3 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
AlexTheCoder
8ca9a87593 Fixed merge conflicts 2017-12-29 01:07:27 -05:00
Spencer
0fc99b39a2 Remove unnecessary generics in _minions 2017-12-29 01:07:27 -05:00
Spencer
131369cebe Finish TargetCancel inside PerkSkeleton 
Should prevent skeletons from attacking teammates
 2017-12-29 01:07:27 -05:00
Spencer
fa72dc60dd Disable blade vortex's effect on teammates 2017-12-29 01:07:27 -05:00
Spencer
aecf04483e Overcomplicate teleporting in team SG 
Should (should) keep teammates together but actual teams separate.
 2017-12-29 01:07:27 -05:00
Spencer
940efc6163 add SurvivalGames#deathmatchTeleport so TeamSG can have different behavior 2017-12-29 01:07:27 -05:00
Spencer
bef403a72c use teleportUniform in Build 2017-12-29 01:07:27 -05:00
Spencer
16905240e9 add UtilPlayer#teleportUniform 2017-12-29 01:07:27 -05:00
Spencer
81db11a640 Reverse cleave's elapsed return 2017-12-29 01:07:27 -05:00
Sam
3749a77b06 Remove squids from the mob gun 2017-12-29 00:50:47 -05:00
Sam
93d7257ce9 Added Mob Bomb Gadget 2017-12-29 00:50:47 -05:00
Sam
8f5a8e882e Show the ender pearl cooldown in the action bar if the player has another ender pearl 2017-12-29 00:22:26 -05:00
Sam
d59c176e5d Prevent anvil interaction 2017-12-29 00:22:26 -05:00
Sam
c478c8f413 Place barrier blocks within the shop npc hitboxes 2017-12-29 00:22:26 -05:00
Sam
c74a754a91 Prevent players duplicating snowballs 2017-12-29 00:22:26 -05:00
Sam
0fa77e741f Fix wrong variables 2017-12-29 00:22:26 -05:00
Sam
42f4b0bb1e Replace the punch 4 bow with power 4 2017-12-29 00:22:26 -05:00
Sam
0aa1d41bb9 Change Cake Wars knockback back to it's previous value 2017-12-29 00:22:26 -05:00
Sam
0657aed11f Prevent team trolling 2017-12-29 00:22:26 -05:00
Sam
6522572fe3 Make sure the snowballs say the name 2017-12-29 00:22:26 -05:00
Sam
ceb85a9657 Make sure snowballs do 1 health to ensure damage manager picks it up 2017-12-29 00:22:26 -05:00
Sam
c225fc1df4 Increase knockback by roughly 25% 2017-12-29 00:22:26 -05:00
Sam
7753f536e5 Frosting Kit 2017-12-29 00:22:26 -05:00
AlexTheCoder
54b27fcb9d Enable Christmas Double XP + Gems 2017-12-22 05:26:25 -05:00
Sam
90b4d003ec Fix the paintball gun gadget teleporting players 2017-12-22 05:25:44 -05:00
Sam
8ec7d92290 Fix Daze Potion doing insane damage 2017-12-19 00:40:56 -05:00
AlexTheCoder
fc5d7754bf Disable scaffold checks 2017-12-18 04:35:25 -05:00
AlexTheCoder
a2ddee1336 Formatting fix 2017-12-14 00:48:12 -05:00
AlexTheCoder
ac69fb275c Update Christmas Chaos II resource pack for versions above 1.8 2017-12-14 00:48:12 -05:00
AlexTheCoder
d1f4cf0f40 Update the customer support whitelist 2017-12-14 00:48:12 -05:00
Dan Mulloy
a4aae7f6ae Unload chunks every 60 seconds 2017-12-14 00:30:32 -05:00
Sam
6362033b9e Stop player's dropping leather armour 2017-12-14 00:29:58 -05:00
Sam
0714399dcf Off by 1 durability issue 2017-12-14 00:29:58 -05:00
Sam
a72dcbb338 Format the ender pearl item to inform players of the cooldown 2017-12-14 00:29:58 -05:00
Sam
00d4cad623 Don't need to else if here 2017-12-14 00:29:58 -05:00
Sam
96263ebf5b Inform players of the ender pearl cooldown 2017-12-14 00:29:58 -05:00
Sam
d885f83159 Change the ender pearl cooldown to 10 seconds 2017-12-14 00:29:58 -05:00
Sam
e4f85eb2b2 Give the golden pickaxe a name 2017-12-14 00:29:58 -05:00
Sam
da32180f32 Remove spawn protection when a player attacks 2017-12-14 00:29:58 -05:00
Sam
c1fc0fb100 Add a new game tip 2017-12-14 00:29:58 -05:00
Sam
7e6dbed17e Fix the teammate message not appearing if there were an odd number of players 2017-12-14 00:29:58 -05:00
Sam
b8d0353a01 Unused imports 2017-12-14 00:29:58 -05:00
Sam
2df02c7030 Actually test the changes made 2017-12-14 00:29:58 -05:00
Sam
ac0c1f8fad Fix spawn protection 2017-12-14 00:29:58 -05:00
Sam
32c4bf1c20 Changes for Cake Wars 1.2 2017-12-14 00:29:58 -05:00
Dan Mulloy
7a42830024 Fix null pointer when game is force stopped 2017-12-14 00:26:34 -05:00
Dan Mulloy
ee898f8185 Add condition validation to find the root cause of SSM errors 2017-12-14 00:26:34 -05:00
Sam
eb9a9d5303 Fixed staff not being able to /spec <player> when vanished 2017-12-14 00:25:08 -05:00
Sam
9bc7ecf8ff Fix the pumpkin king being damaged during the cut scene 2017-12-14 00:25:08 -05:00
Sam
1a2aaf7043 Fixed an issue where rank shard bonuses didn't match their displayed value 2017-12-14 00:25:08 -05:00
Sam
e38c3e6e86 Update the way monthly bonus chests are given 2017-12-14 00:25:08 -05:00
Alexander Meech
f3dcb742b5
Decrease cost of Gingerbread chests 2017-12-09 03:54:55 -05:00
AlexTheCoder
6423f16f91 Fix nullpointer in Cake Wars respawning, disable Anticheat in Christmas Chaos and enable Scaffolding punishments 2017-12-09 02:37:47 -05:00
Sam
3fe4ea2fb6 Increase game timer from 20->30 minutes 2017-12-09 01:19:30 -05:00
Sam
ca51430b5e Remove Gem Hunters Mount skins from the UI 2017-12-09 01:19:30 -05:00
Sam
cf3022cc42 Only run on world change 2017-12-09 01:19:30 -05:00
Sam
b8d2bb9167 Stop ghasts flying away 2017-12-09 01:19:30 -05:00
Sam
6a2cfcc0bf Ensure that previous stands are removed 2017-12-09 01:19:30 -05:00
AlexTheCoder
a6ddd19c4b Change RP URL 2017-12-08 07:10:16 -05:00
AlexTheCoder
30eba9adde Bump anticheat version 2017-12-08 07:04:47 -05:00
AlexTheCoder
eb19a1dd59 Disable anticheat in Castle Siege and enable Christmas words in Master Builders and Draw My Thing 2017-12-08 07:04:47 -05:00
AlexTheCoder
53e8126ba3 Update branch 2017-12-08 06:17:19 -05:00
Sam
d8aa718488 Finish up the wonder that is Christmas Chaos II 2017-12-08 06:17:19 -05:00
Sam
5c98456995 Add additional voice lines 2017-12-08 06:17:19 -05:00
Sam
93df8f2878 Add additional messages 2017-12-08 06:17:19 -05:00
Sam
1a5b2539a2 Cleanup and improvements 2017-12-08 06:17:19 -05:00
Sam
d95a8fe787 Changes from Joe 2017-12-08 06:17:19 -05:00
Sam
7496a90034 Added some checks to try and prevent chests breaking 2017-12-08 06:17:19 -05:00
Sam
a698bbcd28 Make each challenge have 2 presents 2017-12-08 06:17:19 -05:00
Sam
2ab9eb8228 Make Gingerbread Chests 35000 shards 2017-12-08 06:17:19 -05:00
Sam
0b08e6052d Attempt to fix the fireballs fired by ghasts 2017-12-08 06:17:19 -05:00
Sam
e610d7f1ea Changes from testing 2017-12-08 06:17:19 -05:00
AlexTheCoder
bd229d7f78 Fixed merge conflicts 2017-12-08 06:17:19 -05:00
Sam
f7b75a99ba Add additional boss dialogue 2017-12-08 06:17:19 -05:00
AlexTheCoder
4dd28be3af Fixed merge conflicts 2017-12-08 06:17:19 -05:00
Sam
d306863a94 Don't send santa messages when the game is dead 2017-12-08 06:17:19 -05:00
Sam
3d5164408d Add win room 2017-12-08 06:17:19 -05:00
Sam
b7d80afb91 Fix up Section2 2017-12-08 06:17:19 -05:00
Sam
e861e5bca7 Teleport then stop movement 2017-12-08 06:17:19 -05:00
Sam
ad7bbb9e5b Boss Battle phase 2 2017-12-08 06:17:19 -05:00
Sam
3f5ee494d8 Add voices and general improvements 2017-12-08 06:17:19 -05:00
Sam
2720e78932 Increase arrow hitbox 2017-12-08 06:17:19 -05:00
Sam
9920c2d9ab Boss battle phase 1 2017-12-08 06:17:19 -05:00
Sam
cc8d1ca6c4 More progress on the Boss 2017-12-08 06:17:19 -05:00
Sam
782f0c5699 Use armourstands for bosses 2017-12-08 06:17:19 -05:00
Sam
9d2b907f0d Add time change to different sections 2017-12-08 06:17:19 -05:00
Sam
8e4e80f22c Fix Switch parkour 2017-12-08 06:17:19 -05:00
Sam
93fa87b795 Fix a number of lag causes 2017-12-08 06:17:19 -05:00
Sam
9e8d30f86c Fix multiple challenges 2017-12-08 06:17:19 -05:00
Sam
c0d530404e Get the game into a functional state 2017-12-08 06:17:19 -05:00
Sam
f00b774056 More CC stuff 2017-12-08 06:17:19 -05:00
Sam
faf0ebd1ef Finish the first 3 sections 2017-12-08 06:17:19 -05:00
Sam
eda592a35f Implement a better section system 2017-12-08 06:17:19 -05:00
Sam
a40625825d More setup getting CC to work 2017-12-08 06:17:19 -05:00
Sam
570033e3c9 Add ChristmasNew 2017-12-08 06:17:19 -05:00
Sam
77c7362c35 Fix duplication by 0 size itemstacks 2017-12-08 06:00:11 -05:00
Sam
8a856326cb Fix "ot" typo 2017-12-08 06:00:11 -05:00
ArcticZeroo
2ec58c6f30 Add a cost value for KitHumanKnight, since it's currently 0 2017-12-08 05:59:24 -05:00
ArcticZeroo
056f8976b4 Missed a B R A C E 2017-12-08 05:59:24 -05:00
ArcticZeroo
bf3c207cf6 More brace newlines! 2017-12-08 05:59:24 -05:00
Spencer
9f7fd7f19d Newline a bunch more braces... 2017-12-08 05:59:24 -05:00
Spencer
01e879de07 All good, remove debug & unused imports 2017-12-08 05:59:24 -05:00
Spencer
1d2689f222 See if shifting -0.5X made a difference 2017-12-08 05:59:24 -05:00
Spencer
38526b2e65 replace the only <= with < 2017-12-08 05:59:24 -05:00
Spencer
c66d21da90 Reverse debug bool 2017-12-08 05:59:24 -05:00
Spencer
1c6e7df66e subtract half a block from BL corner 2017-12-08 05:59:24 -05:00
Spencer
5c29d75246 Add missing ) 2017-12-08 05:59:24 -05:00
Spencer
d83ad69ab2 Add 1 more line of debug 2017-12-08 05:59:24 -05:00
Spencer
1973f74003 More debug, and colored debug 2017-12-08 05:59:24 -05:00
Spencer
331b20ed47 B R A C E S 2017-12-08 05:59:24 -05:00
Spencer
19f637ba30 add debug command to toggle afk kicking 2017-12-08 05:59:24 -05:00
Spencer
7fc74fddff Whoops, that should be a max. Also add debug 2017-12-08 05:59:24 -05:00
Spencer
07ea1bc9c7 Set BL/TR corners inside BuildData 2017-12-08 05:59:24 -05:00
Spencer
d732d8a551 Remove blank in GameSummaryModule... 
Sometimes the other components like to add extra blanks, and I'm too tired for this right now
 2017-12-08 05:59:24 -05:00
Spencer
8683e8bdc4 add comments, use a more generic map 2017-12-08 05:59:24 -05:00
Spencer
a3a76bc1f9 Fix/add MVP system for Win Effects 2017-12-08 05:59:24 -05:00
Spencer
8a669ccebe More brace newlines 2017-12-08 05:59:24 -05:00
Spencer
9477345823 Fix electrocution stat tracker ONLY giving for teammate hits 2017-12-08 05:59:24 -05:00
Spencer
f13547d9da Newline braces in GamePlayerManager 2017-12-08 05:59:24 -05:00
Spencer
82c1dbe28d Remove debug in StatsCommand 2017-12-08 05:59:24 -05:00
Spencer
2f44c62ba2 I changed my mind, gray text is better here than dgreen 2017-12-08 05:59:24 -05:00
Spencer
14e3518b13 minor improvements to teleportation 2017-12-08 05:59:24 -05:00
Spencer
333cea3f47 Fix players being teleported into blocks in BLD in the most overcomplicated way possible 2017-12-08 05:59:24 -05:00
Spencer
46c8445f38 Color the hover message gray 2017-12-08 05:59:24 -05:00
Spencer
7d006bb85a Remove debug for /stats 2017-12-08 05:59:24 -05:00
Spencer
adf7f4736f Dark green, not light! 2017-12-08 05:59:24 -05:00
Spencer
37657058ae Add a space and hover text to end of game message 2017-12-08 05:59:24 -05:00
Spencer
d70f7a8ec0 Use IncognitoStatusChangeEvent for vanish fixes in BLD 2017-12-08 05:59:24 -05:00
Spencer
449c6511e2 de-trigger mopple 2017-12-08 05:59:24 -05:00
Spencer
875c0a015b add debug command to end build time to BLD 2017-12-08 05:59:24 -05:00
ArcticZeroo
c114823905 Remove the BLD debug 2017-12-08 05:59:24 -05:00
ArcticZeroo
a18e0fb579 Let vanished staff chat in test servers 2017-12-08 05:59:24 -05:00
ArcticZeroo
08329a8667 Don't add vanished players to WinEffectGadget's _other list 2017-12-08 05:59:24 -05:00
ArcticZeroo
c00c58dd0e Add more debug to Build 2017-12-08 05:59:24 -05:00
ArcticZeroo
bacc1e0945 Don't listen for /spec in GamePlayerManager unless the game is in progress 2017-12-08 05:59:24 -05:00
ArcticZeroo
9d4b964e08 Don't let vanished staff use /spec (the one in pregame lobbies) 2017-12-08 05:59:24 -05:00
ArcticZeroo
4ac9fd1b5d Add debug to stats and spec commands to fix usage on vanished staff 2017-12-08 05:59:24 -05:00
ArcticZeroo
3047c528dd Remove the item drop, don't just cancel the event 2017-12-08 05:59:24 -05:00