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

10308 Commits

Author SHA1 Message Date
Sam
1e43398875 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 15:53:27 +00:00
cnr
96a471fa4e Disable mounts 2017-03-14 01:30:06 -05:00
cnr
eeee0bb893 Temporarily disable Gem Hunters tutorial 2017-03-14 01:26:39 -05:00
cnr
78a8e53d2e Re-enable 2FA for Gem Hunters 2017-03-14 00:41:11 -05:00
LCastr0
2b988a02d8 Fixed horse 2017-03-13 19:39:14 -03:00
Sam
654dddbf1b Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-13 22:02:07 +00:00
Sam
a231c0b031 Wooo finally! 2017-03-13 22:01:06 +00:00
LCastr0
c54cd066ef Merge branch 'develop' into update/stpatrickscosmetics 2017-03-12 20:54:48 -03:00
LCastr0
401738f19a Removed horse cooldown 2017-03-12 20:53:43 -03:00
Sam
7ab201f206 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-10 18:10:12 +00:00
cnr
3dc36449b5 Add 2x XP and open Gem Hunters beta 
This is for spring break, and ends 3/19
 2017-03-10 00:29:11 -06:00
Sam
97cb5fe3ce Enable moderation module 2017-03-09 14:01:56 +00:00
Sam
105ab35bb6 Reset exp on death 2017-03-09 14:00:54 +00:00
AlexTheCoder
7ed485c7ca Lets turn up the heat on this chess match... 2017-03-09 01:07:30 -06:00
AlexTheCoder
9fdcce525b Make extreme prejudice a bit more sneaky 2017-03-09 01:07:30 -06:00
AlexTheCoder
b78ce421b5 Notify via redis when an extreme prejudice ban occurs 2017-03-09 01:07:30 -06:00
AlexTheCoder
1148283dff Implement targeted GWEN-based discrimination against certain ip addresses 2017-03-09 01:07:30 -06:00
samczsun
888761d15e Somehow missed Team Super Smash 2017-03-09 01:06:53 -06:00
samczsun
b5f026d4c0 Removem misleading comment 2017-03-09 01:06:53 -06:00
samczsun
a99cb6579d PC-814 2017-03-09 01:06:53 -06:00
samczsun
4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
AlexTheCoder
a069d7ab59 Remove unnecessary INNER JOIN in sql to load a home server id 2017-03-09 01:04:50 -06:00
AlexTheCoder
721dd5a29a Update SQL to follow table name standards, color channel names in Carl GUI, and fix item positions in GUI 2017-03-09 01:04:50 -06:00
AlexTheCoder
f2394da7dc Give RewardManager access to StatsManager 2017-03-09 01:04:50 -06:00
AlexTheCoder
a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
AlexTheCoder
7e70d02751 Properly award all values in BonusAmount wherever it is used for rewarding 2017-03-09 01:04:50 -06:00
AlexTheCoder
a4c875b4bd Refactor Clans gold to be set from Core 2017-03-09 01:04:50 -06:00
AlexTheCoder
9591485bb6 Re-implement voting with Gem rewards and start refactoring Carl gold rewards 2017-03-09 01:04:50 -06:00
Sam
b0b437ab4e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-08 18:24:37 +00:00
Sam
a9b53c8608 Gem Hunters Phase 2 2017-03-08 12:51:16 +00:00
LCastr0
3469b890d4 Rainbow taunt now uses sides of player as locations 2017-03-07 21:51:06 -03:00
LCastr0
1ffac1dd31 Drop nuggets when removing chests 2017-03-06 18:09:42 -03:00
LCastr0
63b4dd1053 Support server stuff 2017-03-06 17:33:36 -03:00
LCastr0
ec5de0ef12 Merging issues 2017-03-06 17:10:29 -03:00
LCastr0
3cc304d99c Used correct item for the mount 2017-03-04 23:52:12 -03:00
LCastr0
3d76f04508 Fixed rainbow taunt lagging players 2017-03-04 16:08:55 -03:00
LCastr0
f9b66e28f4 Fixed taunts not being disabled correctly 2017-03-04 14:07:24 -03:00
LCastr0
85b5eee92f Fixed the rainbow taunt 2017-03-04 00:40:53 -03:00
LCastr0
d6605e973d Changed chest animation 2017-03-03 23:38:32 -03:00
LCastr0
4a496ea4c1 Added particle for when opening the chests 2017-03-03 22:34:21 -03:00
LCastr0
2b18d62f0f Added icons and lores 
Added floor for the chest
Fixed little copy paste error in BuyChestButton
Reduced amount of gold in the costume
 2017-03-03 21:50:16 -03:00
cnr
06a71946a0 Publish server status earlier during startup 
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
 2017-03-03 08:15:56 -06:00
Sam
4211682ca2 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-02 20:30:00 +00:00
LCastr0
28746c7873 St Patricks Chest 2017-03-02 15:50:56 -03:00
Sam
cfe2a07278 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-03-02 16:58:26 +00:00
Sam
811b27b478 Apply mount cooldowns when the horse despawns 2017-03-02 16:58:25 +00:00
samczsun
d072fc3c21 Direct upload 2017-03-01 23:58:20 -06:00
samczsun
a0e79d87a2 Allow ops to use minecraft commands 2017-03-01 23:58:20 -06:00
samczsun
b782f5ced9 Speed up generation 2017-03-01 23:58:20 -06:00
samczsun
f8dbbce106 Cleanup 2017-03-01 23:58:20 -06:00
samczsun
dedcd254b0 Clean up maps on local server 2017-03-01 23:58:20 -06:00
samczsun
9669e960a7 Autorotate maps 2017-03-01 23:58:20 -06:00
samczsun
3e8b23c6f4 Sentry Issue #223473496 
Don't bother with failsafe if the game is null (i.e. beyond dead)

Steps to reproduce:
1) Quit server at just the right time
 2017-03-01 23:54:02 -06:00
samczsun
b3cc9f29e2 Sentry Issue #223905084 
Prevent NewsManager from updating news when none exists

Steps to reproduce:
1) Join the server while the server is starting up
 2017-03-01 23:54:02 -06:00
samczsun
3f40432268 Sentry Issue #223474603 
Handle null gun in Minestrike

Steps to reproduce:
1) Bring a player down to low health using a molotov
2) Kill them with a grenade
 2017-03-01 23:54:02 -06:00
samczsun
9571db123d Sentry Issue #223483175 
Fix badly implement Player check in PerkBoneRush

Steps to reproduce:
1) Pick Skeletal Horse
2) Bone rush on some mob (i.e. cows in swamp)
 2017-03-01 23:54:02 -06:00
samczsun
7af7abd615 Sentry Issue #223589200 
Fix PetManager trying to rename a pet when it doesn't exist

Steps to reproduce:
1) Somehow make MSSQL slow
2) Rename pet, and disable pet
 2017-03-01 23:54:02 -06:00
samczsun
cb9ac1fc9f Sentry Issue #223481030 
Prevent Fish Flurry from activating if no suitable blocks are found

Steps to reproduce:
1) Select squid on hyrule castle
2) Activate fish flurry while looking at middle of empty side of castle
 2017-03-01 23:54:02 -06:00
samczsun
7e9211815f Sentry Issue #223481223, #223481117 
Reverse check so RHS can be null

Steps to reproduce:
1) Pick Wither Skeleton in SSM
2) Throw wither image away from other player so it has no target
3) When it's standing still (i.e no target), have the other player punch
the image
 2017-03-01 23:54:02 -06:00
samczsun
0725639852 Sentry Issue #223596821 
Check if player has left before performing actions

Steps to reproduce:
1) Pick wolf in SSM
2) Hit someone
3) Quit immediately after
 2017-03-01 23:54:02 -06:00
samczsun
2e23d59702 Sentry Issue #223489411 
Check if fired projectile is a WitherSkull before casting

Steps to reproduce:
1) Go to Wither Assult
2) Fire enderpearl
 2017-03-01 23:54:02 -06:00
samczsun
c4bb9a23d5 Sentry Issue #223492448 
Check if Power Player data is loaded before acting on it

Steps to reproduce:
1) Join before server has started up
 2017-03-01 23:54:02 -06:00
samczsun
ed25fe1341 Sentry Issue #224064210 
Have BonusManager check if Carl is enabled before cleaning up items

Steps to reproduce:
Trigger SQLException in NPCManager so NPCs aren't loaded,
or temporarily remove Carl from npcs database
 2017-03-01 23:54:02 -06:00
samczsun
4d3301da56 Sentry Issue #223476291 
Check whether worlds are equal before performing distance checks

Steps to reproduce:
1) Open treasure on one account
2) Go to Mavericks World on another account, tp to coords of treasure
 2017-03-01 23:54:02 -06:00
Sam
13ffcbbd9b Rewrite of logout npcs, lots of quests 2017-03-01 18:07:35 +00:00
LCastr0
ff6a3e915e Add Gold Pot Morph 2017-02-28 23:12:07 -06:00
Sam
0ca4b2041d Fix a CCE in MorphDinnerbone 2017-02-27 19:00:06 +00:00
Sam
9df5d3e746 Add /cashout and /map commands 2017-02-26 17:30:35 +00:00
Sam
7760404b4e Lots of world events! 2017-02-26 17:16:16 +00:00
Sam
d4bdc3e5d1 Fix flint and steel 2017-02-26 17:16:04 +00:00
Sam
275cadda9d Decrease the amount of sewer mobs 2017-02-26 17:14:53 +00:00
Sam
3a1fef6557 Increase supply drop timer and fix the "wood" block bug 2017-02-26 17:14:41 +00:00
Sam
2f08c031a4 Re-enable mounts 2017-02-26 17:14:21 +00:00
Sam
0f30c58fe7 Fix /supplydrop start when the name was more than one word 2017-02-26 17:14:10 +00:00
Sam
31efd50489 Add support for multiple world event markers 2017-02-26 17:13:35 +00:00
Sam
dc66a79ef7 Fix rank upgrades not working maybe? 2017-02-26 17:13:16 +00:00
Sam
e1165d1746 Add support for World Event loot 2017-02-26 17:13:00 +00:00
Sam
fc57b35534 /disguise and strict anticheat 2017-02-26 17:12:44 +00:00
Sam
badde2b058 Fix spectators being able to damage other players 2017-02-26 17:12:25 +00:00
Sam
76f587cff5 Disable damage manager and particles 2017-02-26 01:31:20 +00:00
Sam
7d5d5d5401 Re-enable 2fa 2017-02-25 15:47:24 +00:00
Sam
54f9677d2a Make the world event marker rotate based on exact yaw 2017-02-25 15:46:06 +00:00
Sam
fafcc9eb1c Add support for durability in LootItem 2017-02-25 15:46:06 +00:00
cnr
699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
cnr
7de556e3d8 Allow plugins to choose a hub type when restarting 
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
 2017-02-25 00:35:46 -06:00
cnr
9450c29e3e Allow ETERNAL into the beta 2017-02-25 00:31:12 -06:00
LCastr0
7201e0ec0d Added taunt to menu 2017-02-24 22:08:36 -03:00
LCastr0
d471ac112e Fixed rainbow taunt a bit 2017-02-24 22:08:04 -03:00
LCastr0
b2fd8ac748 Rainbow taunt 2017-02-24 22:06:18 -03:00
Sam
605fcf90dd Stop players spawning near others when joining 2017-02-24 23:50:37 +00:00
Sam
02a2f98601 Allow flint and steel 2017-02-24 23:40:30 +00:00
Sam
9219e50a1c Don't spawn purple chests when there are less than 10 players 2017-02-24 23:05:07 +00:00
LCastr0
a32cb6ab2f Mount 2017-02-24 19:39:54 -03:00
Sam
7be7b47395 Debug stuff 2017-02-24 22:11:27 +00:00
Sam
ce272a3288 Fix hunger is safezones for real this time 2017-02-24 22:11:17 +00:00
Sam
a7edc830e0 Fix cashout related problems with cashing out 2017-02-24 20:52:54 +00:00
Sam
43524465c7 Fix the damageToLevel bug 2017-02-24 20:51:40 +00:00
Sam
71964b7bca Fix the no eat bug inside safezones 2017-02-24 20:51:26 +00:00
Sam
2090d2202c Actually give people gadget items 2017-02-24 20:51:11 +00:00
Sam
295f626ec4 Actually remove gems when players join 2017-02-24 20:50:53 +00:00
cnr
76ef632e81 Reward gems and shards the correct way 2017-02-24 06:57:16 -06:00
cnr
3858421194 Fix combat NPC issues 
- Cashed out players were treated as combat-logged players
- Player inventories were not cleared before returning items, resulting
  in duplicated items
- Players would be given the "locked slot" item
- Allow multiple stacks of the same type and amount
 2017-02-24 06:57:15 -06:00
cnr
68f61bbb20 Send players to beta hubs; add 2fa and anticheat 2017-02-24 06:57:15 -06:00
cnr
162ab602b2 Rename GemHunters output jar 2017-02-24 06:57:15 -06:00
cnr
eed784da04 Add beta whitelist to GemHunters and remove missing debug references 2017-02-24 06:57:00 -06:00
cnr
fb70c93f91 Add beta whitelist miniplugin 2017-02-24 00:46:05 -06:00
samczsun
60d9bd5d21 Move api to config file 2017-02-24 00:46:04 -06:00
cnr
af8b5f6522 Add Mineplexer support for beta lobbies 2017-02-24 00:46:04 -06:00
cnr
9ece8c9959 Add beta whitelist miniplugin 2017-02-23 23:39:34 -06:00
Sam
eb6003a169 Final push 2017-02-24 01:06:05 +00:00
LCastr0
8088cef29f Leprechaun pet fixed 2017-02-23 20:12:11 -03:00
LCastr0
e731a91e40 Leprechaun pet 2017-02-23 17:35:50 -03:00
LCastr0
63cef754f6 St Patricks outfit 2017-02-23 14:57:52 -03:00
Sam
2b64de8ad1 Preparation for beta 2017-02-23 14:42:55 +00:00
samczsun
5b13a87500 Move api to config file 2017-02-22 23:32:56 -06:00
cnr
3d4e64a208 Add Mineplexer support for beta lobbies 2017-02-22 22:12:01 -06:00
Sam
bde899212f Allow other players to pickup quests 2017-02-21 12:36:48 +00:00
Sam
75f734c5e7 Fix where after many hours chests would stop spawning 2017-02-21 10:08:48 +00:00
Sam
1b2c384afe Mounts base 2017-02-21 09:56:08 +00:00
Sam
4fc991dd24 Add sewer mobs 2017-02-20 21:02:49 +00:00
Sam
77dfc2a7c7 No need for UtilServer 2017-02-18 10:37:40 +00:00
Sam
15395d1391 Fix item giving and animations going to the wrong player 2017-02-18 10:37:26 +00:00
Sam
af29135026 ItemFrames and Leaves 2017-02-18 10:37:03 +00:00
Sam
0fa0d88aac Clean up sewer mobs 2017-02-18 10:36:50 +00:00
Sam
074c786c35 Don't allow purchase if inv if full 2017-02-18 10:36:38 +00:00
Sam
4cb4f944e7 Fix the map not working when players relog 2017-02-18 10:36:23 +00:00
Sam
30d2059e9a Use MiniClientPlugin for gem tracking 2017-02-18 10:36:05 +00:00
Sam
14f33ba494 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-18 10:35:19 +00:00
cnr
b80a41ebe7 Reduce refresh rate of communities 
Communities will only be refreshed if:
- We know (via redis message) that the community has been changed (e.g.,
  if a member joins/leaves, if an invite is sent, ...).
- Five minutes have passed since a full refresh
 2017-02-18 01:31:53 -06:00
Sam
be2963cf79 More Sam Quotes 2017-02-17 19:41:48 +00:00
Sam
52bcd01e27 Remove give item cooldown 2017-02-17 19:04:16 +00:00
Sam
9db3ddc2d9 Remove debug message 2017-02-17 19:04:08 +00:00
Sam
5fbbae1493 The SamitoD quest 2017-02-17 18:55:38 +00:00
Sam
2657a98e70 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-17 18:16:36 +00:00
Sam
d56cd59df0 Quests and a whole host of wacky changes 2017-02-17 18:16:17 +00:00
Sam
cf36c83f4b Use Consumers instead of Callbacks 2017-02-16 14:15:56 +00:00
cnr
b8ac877fa3 Don't add US records twice 2017-02-16 02:55:29 -06:00
samczsun
01e83f0646 Final touches 2017-02-16 02:04:34 -06:00
samczsun
ecb42d91fe Fix bugs 2017-02-16 02:04:34 -06:00
samczsun
e7dbe48937 Block morph rewrite 2017-02-16 02:04:34 -06:00
LCastr0
0befc7d967 Fixed issue with gadget command re-enabling after running 2017-02-16 02:04:02 -06:00
samczsun
81f38cf06b Give trainees find 2017-02-16 02:03:25 -06:00
samczsun
7e18989fb7 PC-267 PC-545 PC-1253 
This is to fix a troublesome race condition occurring between Mineplexer
and Core. Simply put, the following steps occur normally:

1) Player logs in via Bungee
2) If there is no PlayerInfo entry, PlayerStats inserts a PlayerInfo entry
into Redis
3) CoreClientManager looks for the PlayerInfo entry and finds it
4) If the PlayerInfo entry was just inserted, it will have accountId=0.
CoreClientManager sees this and updates it to a valid accountId, then
reinserts into Redis
5) All is good

However, sometimes Step 3 occurs before Step 2 (perhaps latency to Redis
is a factor), and so CoreClientManager
sees a null entry and ignores it. Then, an invalid PlayerInfo entry is
inserted with accountId=0, which then breaks any SQL queries relying on an
valid accountId
 2017-02-16 02:03:25 -06:00
samczsun
cd387284bf Ignore armorstands for fleshhook/snowball 2017-02-16 02:03:25 -06:00
samczsun
16ba7b984b Use proper GameProfile serializer 2017-02-16 02:03:25 -06:00
Peter Miller
e59d744074 Temporarily reassigning to US Redis IP for EU player redirection testing. 
10.81.1.156 -> 10.33.53.16
 2017-02-16 02:02:44 -06:00
Sam
a879a1dc80 Item Map added 2017-02-13 18:18:32 +00:00
Sam
da28254af0 Join and Quit messages 2017-02-13 18:18:17 +00:00
Sam
652d6d0f84 Add a GiveGemsCommand 2017-02-12 15:23:50 +00:00
Sam
bc6cae9b5e Remove silly "@author" 2017-02-12 15:23:37 +00:00
Sam
3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
Sam
16773521b9 Lots of fixes 2017-02-11 17:18:39 +00:00
AlexTheCoder
11791bc461 Block joining clans servers via friends, block joining of clans servers that are restarting, clean up log mob armor stands on restart, take staff out of observer mode on restart 2017-02-09 22:44:30 -06:00
Alexander Meech
1736b198f2 Fix Twitch+ Mps not properly showing information via MOTD 2017-02-09 22:44:18 -06:00
samczsun
5e5b607fc8 Fix my goof 2017-02-09 22:44:00 -06:00
Sam
e8b5c180ee QA Testing fixes 2017-02-09 23:47:17 +00:00
Nate Mortensen
1780923501 Fix Frost Barrier not activating 
Negative yaw values are considered valid in minecraft.
UtilShapes doesn't correctly handle negative yaw values
(throws an ArrayIndexOutOfBoundsException) so whenever
a player is facing east they're unable to activate Frost
Barrier.

This commit fixes the issue by allowing UtilShapes to take
negative values.
 2017-02-08 22:32:57 -06:00
Nate Mortensen
9444da9dae Fix item drop check in Wizards 
Currently players are unable to drop items if the held item
slot is below 5.  This works fine when dropping items simply
by pressing q, but it often interferes with players dropping
items from an open inventory.  This commit changes the check
to iterate over the first five slots and only cancel the event
if they're dropping one of them.
 2017-02-08 22:32:57 -06:00
Nate Mortensen
abbb46ec0a Fix the death message when using Summon Wolves 2017-02-08 22:32:57 -06:00
Nate Mortensen
1425a2aaed Fix Rumble spell slowness level 2017-02-08 22:32:57 -06:00
Nate Mortensen
b90e879d4b Fix protection provided by Gold armor in Wizards 
While the name of the gold items is "Golden X", the
name of the material is "GOLD X" resulting in gold items
providing no protective benefit other than the default
vanilla protection(in the case of there being only gold
armor).
 2017-02-08 22:32:57 -06:00
Nate Mortensen
4031b037de Correct damage for Fireball and AnvilDrop 
This issue came down to two bugs with the explosions created
by Fireball and AnvilDrop.

The first was the damage being done.  Settings the max damage
doesn't change the base damage, so they did the default amount
of damage based on the vanilla code.

The second was the radius of the explosion.  The radius was
too small, and so it was perceived that only users directly hit
would suffer damage.  The radius was increased, however the block
explosion size was kept the same.
 2017-02-08 22:32:57 -06:00
Nate Mortensen
941be75161 Allow spells to be learned from double chests 2017-02-08 22:32:57 -06:00
cnr
181f360f11 Merge branch 'update/cosmetics-valentines' into develop 2017-02-08 22:32:35 -06:00
Alexander Meech
6583e86ace Remove william's copyright file headers 2017-02-08 22:24:19 -06:00
Alexander Meech
908b282fdf Fix issue with spaces in ChooseMapButton 2017-02-08 22:24:19 -06:00
LCastr0
06cc8a06c1 Added lore for cupid pet 2017-02-08 21:56:49 -02:00
LCastr0
452a128b2b Added win room to love chest 2017-02-08 21:54:41 -02:00
LCastr0
22f6f243aa Fixed hover effect 
Fixed love chest lore being purple
 2017-02-08 15:44:05 -02:00
LCastr0
5902e82d58 Added message if blow a kiss doesn't hit anyone 
Changed the lore for the taunt
Changed the display item and lore for the love chest
 2017-02-08 15:17:04 -02:00
LCastr0
5dcf028a37 Fixed win room being unlocked by default 2017-02-06 23:52:15 -02:00
Sam
e76ce9dce2 Add a treat for samczsun 2017-02-07 00:17:26 +00:00
Sam
44d4fb9d60 Fix /ignore not working 2017-02-07 00:12:59 +00:00
Sam
7452712107 Fix Constants 2017-02-07 00:12:51 +00:00
Sam
2f9f55226a Adjust world border distance 2017-02-07 00:05:10 +00:00
Sam
3018f264cc QA ready! 2017-02-06 23:28:27 +00:00
Sam
36f318e4a0 KP Upgrades (1) 2017-02-06 21:00:30 +00:00
Sam
bc510e5ad5 QA fixes 2017-02-05 22:24:10 +00:00
samczsun
1c96196359 Various changes for network security 2017-02-04 23:14:52 -05:00
samczsun
f4a9253505 Remove pending bans on instant ban 2017-02-04 20:42:49 -05:00
LCastr0
511bfdecd7 Added lores and icons 2017-02-03 18:45:00 -02:00
Sam
6cc5a14073 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-03 20:33:54 +00:00
Sam
13806a49d2 Bridges bug fixes 2017-02-03 20:33:21 +00:00
LCastr0
adb3386899 Added tracker for love chest 2017-02-03 18:32:29 -02:00
LCastr0
9669f626a1 Fixed issue with chest pages not turning to page 2 2017-02-03 18:31:32 -02:00
LCastr0
9024bb6569 Added custom floor for Love chest 2017-02-02 12:28:10 -02:00
Sam
99ff344679 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-02-02 13:20:14 +00:00
Sam
0d9deb019b I do so much I never know what I commit 2017-02-02 13:19:23 +00:00
samczsun
8a3b531a06 Bawk Bawk Battles rewrite 2017-02-02 00:31:58 -06:00
AlexTheCoder
16c155ffe8 Reorganize player data representation for better combating chargebacks 2017-02-02 00:23:05 -06:00
Alexander Meech
f53405970c Fix spacing in pom.xml 2017-02-02 00:16:03 -06:00
AlexTheCoder
552241b070 Implement a Clans Compensation for players impacted by the Clans-103 deletion 2017-02-02 00:16:03 -06:00
AlexTheCoder
dd37b6e89c Build ClansCompensation with the other plugins 2017-02-02 00:16:03 -06:00
md_5
7dc4c6b5b9 Compile fixes for OpenJDK-9 
* Upgrade maven-jar-plugin to be compatible
* Remove unused / incompatible imports from PlayerInputActionMenu
 2017-02-02 00:14:02 -06:00
LCastr0
d06c445e9c Reduced amount of particles from love train mount 2017-02-01 11:38:13 -02:00
LCastr0
ea8a4d2786 Reduced amount of particles from love doctor morph 2017-02-01 11:37:11 -02:00
LCastr0
048272ef59 Removed heart particles from love wings 2017-02-01 11:36:12 -02:00
LCastr0
4a42ed42bd Reduced amount of particles in love chest spawning 2017-02-01 11:35:31 -02:00
LCastr0
c0065ae696 Blow a kiss blowing kiss to yourself 2017-02-01 11:33:17 -02:00
LCastr0
c442c820f5 Disabled purchasing love chest with all the items unlocked 2017-02-01 11:29:50 -02:00
LCastr0
b5130181a2 Merging errors 2017-02-01 11:25:47 -02:00
Sam
c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00
Sam
fb35f19c3d Add Villager Properties support 2017-01-30 19:09:07 +00:00
LCastr0
0ce741a5fb Small wings for cupid pet 2017-01-28 21:38:14 -02:00
LCastr0
2cfd51e38e Heart shaped wings 2017-01-27 17:40:35 -02:00
LCastr0
e2de60971e Fixed uneven butterfly wing 2017-01-27 10:29:18 -02:00
Sam
7200572583 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-26 20:10:48 +00:00
LCastr0
dd9f6e938d Added small butterfly wings 2017-01-26 09:56:21 -02:00
Alexander Meech
741d0914ba Change premium rank hover descriptions 2017-01-25 21:12:30 -06:00
cnr
b2d17f2680 Merge branch 'update/true-love-pet' into develop 2017-01-25 21:11:56 -06:00
cnr
70948b6967 Refactor PowerPlayClubItem instead of using an event 2017-01-25 21:10:32 -06:00
cnr
20efc234fa Allow YT to use /disguise 2017-01-25 20:33:25 -06:00
Sam
a62ecdb212 Custom Bridges and Per player world borders 2017-01-25 21:38:58 +00:00
Sam
692fcbacbb Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-24 17:18:29 +00:00
Sam
2c8b8d4fb0 Add max chests 2017-01-23 19:56:00 +00:00
LCastr0
340f629f09 Changed knockback in winroom 2017-01-21 20:13:19 -02:00
LCastr0
9876c0c61c Changed particles for wings 2017-01-21 19:58:59 -02:00
Sam
8102ba2e4b Lots of stuff 2017-01-21 20:45:22 +00:00
Sam
c7c7b4448f Use File.separator 2017-01-21 14:46:18 +00:00
Sam
0827ea2da0 World Listeners 2017-01-21 14:46:05 +00:00
Sam
24d71e09fe Teleport dead people 2017-01-21 14:45:58 +00:00
Sam
4c38a5878f Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:28:57 +00:00
Sam
490d1d86f2 Give players their earnt gems 2017-01-21 14:24:04 +00:00
Sam
3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
Sam
f5e86f4bc1 Update Villager trading and Events 2017-01-21 14:21:00 +00:00
LCastr0
023ed5ed4a Small fixes for win room 2017-01-20 22:12:01 -02:00
cnr
8ae74ce952 Increase 2FA window size 2017-01-20 15:42:21 -06:00
cnr
fbb1836eb5 Change Brawl fountain goal to 35M gems 2017-01-20 14:30:54 -06:00
Sam
a16acedb14 Google Sheets v2 finally 2017-01-20 20:08:24 +00:00
cnr
4bb51a3734 Fix non-[\x00-\x7F] characters breaking chat 2017-01-20 01:27:59 -06:00
samczsun
7c829f8712 Filter duplicates, handle permissions in multicommand, support more commands 2017-01-20 01:27:59 -06:00
samczsun
8b1fe8302e Match Bukkit tab completion behaviour 2017-01-20 01:27:58 -06:00
samczsun
cc9f28dfec Fix holes in Skywars 
Skywars's crumble affects any block which has been updated, including
blocks outside the game world. This commit checks if a block is in the
game world before crumbling it
 2017-01-20 01:27:58 -06:00
samczsun
c340e48daa Fix Amplifier NPCs disappearing 
Melon Launchers could be used to shove armor stands around. This has been
disabled
 2017-01-20 01:27:58 -06:00
samczsun
8479e80f8e Change intent of /hub to PLAYER_REQUEST 2017-01-20 01:27:58 -06:00
cnr
8fdbe87d1d Allow spaces when checking 2FA codes 2017-01-20 01:27:58 -06:00
cnr
fded8a6583 Change 2FA issuer on the test network 2017-01-20 01:27:58 -06:00
cnr
f23f04fdb1 Fix NPE in getOrLoadClient 2017-01-20 01:14:03 -06:00
cnr
8f72f9d087 Only require 2FA for MAPDEV+ 2017-01-20 01:14:03 -06:00
samczsun
8dc0961f03 Remove debug message 2017-01-19 23:12:29 -05:00
samczsun
f83550157c PC-1034 
The `z` variable wasn't being reset properly
 2017-01-19 23:12:26 -05:00
samczsun
66af3cc450 Fix parties mute bypass 2017-01-19 23:12:23 -05:00
samczsun
1ff05eb3ff Reset Magma Cube kill counter on game end 2017-01-19 23:12:11 -05:00
samczsun
7290b83466 Fix Skywars eating/bowing/whatevering bug 2017-01-19 21:24:50 -05:00
samczsun
5ca9b79333 Fix Fissure doing no damage 2017-01-19 18:49:51 -05:00
LCastr0
34bf89187d Added win room to gadget manager 2017-01-19 21:44:57 -02:00
LCastr0
d2c7e48903 Started on the battlefield win room 2017-01-19 21:17:17 -02:00
samczsun
343167245e Fix party chat 2017-01-19 18:16:43 -05:00
LCastr0
a6ab41fe3f Fixed cupid pet 2017-01-19 21:14:15 -02:00
Sam
8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
Sam
36c0c56f27 World Events and Sheets rewrite 2017-01-19 21:15:06 +00:00
LCastr0
2fd0e72439 Changed type of love wings 2017-01-19 04:56:11 -02:00
LCastr0
da36276bc3 Changed permissions for unlockcosmetics command 2017-01-19 00:50:42 -06:00
LCastr0
6180162476 Now only remove on teleport if its void 2017-01-19 00:50:42 -06:00
LCastr0
704c787008 Fixed lava and void issues again, prevents CME 2017-01-19 00:50:42 -06:00
LCastr0
d7fe81184a Better message when despawning balloons 2017-01-19 00:50:42 -06:00
LCastr0
0d1f3a0613 Fixed balloons dying on void 
Fixed balloons bug near lava
Fixed balloons lore in menu
 2017-01-19 00:50:42 -06:00
LCastr0
7f22872dd6 Changed OpenBalloons so it actually opens the balloons menu 2017-01-19 00:50:42 -06:00
LCastr0
a1a0271cd9 Added balloons to gadgets 2017-01-19 00:50:42 -06:00
LCastr0
9cba2aa9fc Removed disabled balloons from chests 2017-01-19 00:50:42 -06:00
LCastr0
03aa049f40 Added balloons to chests 2017-01-19 00:50:42 -06:00
cnr
e3b56eda2a Add 2FA reset command 2017-01-19 00:15:17 -06:00
cnr
9831c7259a Enforce 2FA and re-enable unbans for trainee+ 2017-01-18 23:47:47 -06:00
samczsun
fd65f2df1b Tab completion for /game set 2017-01-18 23:34:57 -06:00
samczsun
6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06:00
samczsun
e5ece844cb Tab completion 2017-01-18 23:20:56 -06:00
samczsun
1bb96625f7 Add missing import 2017-01-18 23:20:24 -06:00
samczsun
2ffae9f078 Enable strict anticheat in Gladiators (Artix) 2017-01-18 23:20:24 -06:00
samczsun
c5d5d86c1d Use CoreClient instead of Player in case the player quits 2017-01-18 23:20:24 -06:00
samczsun
ac63985419 Revert removing strict anticheat 2017-01-18 23:20:24 -06:00
samczsun
cdc4f3debd Don't try to reload client if already loaded 2017-01-18 23:20:24 -06:00
samczsun
1ce69dfa14 PC-1054 PC-1164 
GameTeam can't handle spawnpoints which are also solid blocks, and
SurvivalGames has a chance of spawning a chest on a spawn platform. When
this happens, the next closest spawn is always the same spawn because the
two players will be exactly 1 block apart, causing everyone to spawn at
the same podium. This commit prevents SurvivalGames from generating random
chests on spawn podiums
 2017-01-18 23:20:24 -06:00
samczsun
cc7150850c PC-221 
In Block Hunt, hitting an entity will cause an "Cancelled Infection" event
to propagate upwards the stack. This commit checks whether the game is
live before beginning the cancellation
 2017-01-18 23:20:24 -06:00
samczsun
e309abc968 PC-1051 PC-1238 
Some kits had armor in the wrong order, causing them to render
incorrectly. This commit reorders the armor.
 2017-01-18 23:20:24 -06:00
samczsun
63357b0fc5 PC-1303 
In the 1.11 update, the override was mistakenly toggled off while spawning
in skeletons. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
samczsun
8e5483e42b PC-190 
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
 2017-01-18 23:20:24 -06:00
samczsun
d856736bf4 PC-1301 
If a player joins before any of our listeners are registered, they'll have
an account id of -1. If they manage to also not have a redis entry, their
cached id will also be -1. This breaks stuff. Instead, let's just kick
them.

Note that I'm not sending them using Portal because Portal is slow and I
want them off the server immediately
 2017-01-18 23:20:24 -06:00
samczsun
0ae4bd2281 PC-938 PC-1294 
For whatever reason, Minestrike nametags don't hide properly on
hotjoining. This is a simple fix which just resets all nametag
visibilities on game reset. Should work, right?
 2017-01-18 23:20:24 -06:00
samczsun
2bac38385f PC-1299 
In the 1.11 update, the override was mistakenly toggled off while spawning
in wither skeletons. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
samczsun
4cd643f64f PC-1040 
In one of my previous commits, while migrating CompassAddon ->
CompassModule I accidentally removed two logical components. The first
prevented compasses from being given out in the pregame lobby, and the
second allowed players who were dead to receive compasses. Both have been
re-added.
 2017-01-18 23:20:24 -06:00
samczsun
283dd23920 PC-1298 
In the 1.11 update, the override was mistakenly toggled off while spawning
in horses. This commit undoes that change.
 2017-01-18 23:20:24 -06:00
LCastr0
912bad5035 Used wrong method name 2017-01-18 21:20:32 -02:00
LCastr0
1557f3a39c Added love chest to customer support server 2017-01-18 21:02:57 -02:00
LCastr0
ed8363e1be Added items to infused chests 2017-01-18 20:57:54 -02:00
LCastr0
4cdb652b79 Removed winter items from infused chests 2017-01-18 20:35:17 -02:00
LCastr0
ad9caa68a0 Small change to treasure page 2017-01-18 20:34:16 -02:00
LCastr0
f93794f14d Removed permissions for snr mods to use unlock cosmetics 2017-01-18 20:31:35 -02:00
LCastr0
6ba1901490 Revert "Revered changes to chest page" 
This reverts commit 419c4b1053.
 2017-01-18 01:07:50 -02:00
LCastr0
419c4b1053 Revered changes to chest page 2017-01-18 00:52:36 -02:00
LCastr0
3e16c7fdf0 Added items to love chest (missing win room) 2017-01-17 23:34:16 -02:00
LCastr0
d49e85c21a Corrected chances for love chest 2017-01-17 23:30:29 -02:00
LCastr0
447a1cee18 Removed unused code 2017-01-17 23:28:19 -02:00
LCastr0
09c43ce73b Added love chets to titles tracking 2017-01-17 23:26:09 -02:00
LCastr0
65cc1b598d Change Flame Rings icon 
Fixed issue with buy chest button
 2017-01-17 21:08:38 -02:00
LCastr0
75ede7f823 Fixed present danger display item 2017-01-17 20:21:37 -02:00
LCastr0
27aa682727 Stops players from purchasing the chest 2017-01-17 20:20:17 -02:00
LCastr0
76b356f73c Removed gingerbread chest 2017-01-17 19:24:27 -02:00
Sam
1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
LCastr0
cdd1e63989 Ops, are we back in time? Fixed lore saying 2012 instead of 2017 2017-01-17 06:30:47 -02:00
LCastr0
ccd490b41a Added love chest 2017-01-16 21:06:24 -02:00
LCastr0
819741d8ff Removed gadget selection since it will only work during games 2017-01-16 19:55:28 -02:00
LCastr0
a70c8eccc6 Blow a kiss taunt 2017-01-16 19:43:49 -02:00
LCastr0
ddc098649f Cupid Pet 2017-01-16 19:28:06 -02:00
LCastr0
694b2f69b2 Love train mount 2017-01-16 19:02:22 -02:00
LCastr0
ebfd6e5cc5 Use correct way for adding pets to ppc 2017-01-16 04:19:57 -02:00
LCastr0
c571736def Silent villager 2017-01-16 01:57:42 -02:00
LCastr0
9e4f756fe8 Even better way of making pet circle around you 2017-01-15 02:46:44 -02:00
LCastr0
7600cd6e04 Added enderman gun 2017-01-15 00:07:48 -02:00
LCastr0
46552428a4 Make them slower 2017-01-14 23:55:24 -02:00
LCastr0
6e399b10db Increased radius 2017-01-14 23:27:02 -02:00
LCastr0
3d49eb2181 Better way to handle the circle points 2017-01-14 23:21:49 -02:00
LCastr0
2398fbc8c9 Added correct ppc lore 2017-01-14 23:15:41 -02:00
LCastr0
6c75f6e7dc Showing correct icon for pets 2017-01-14 23:12:31 -02:00
LCastr0
fb05a08e91 Merge branch 'develop' into update/true-love-pet 2017-01-14 23:10:20 -02:00
LCastr0
28442abbbd Now using the correct naming... 2017-01-14 23:09:46 -02:00
LCastr0
e03b59bb7c Added love wings to gadget manager 2017-01-14 22:22:17 -02:00
LCastr0
03c2ec56b7 Added love wings 2017-01-14 22:21:38 -02:00
LCastr0
33cb3b74fc Added love doctor morph to gadgetmanager 2017-01-14 22:11:25 -02:00
LCastr0
fa9f895891 Use the correct event 2017-01-14 21:01:18 -02:00
LCastr0
d667524ed9 Love Doctor Morph 2017-01-14 20:50:44 -02:00
LCastr0
2976eab5bf Added particles 2017-01-14 20:06:12 -02:00
LCastr0
8c11f2c4cb Added True Love Pet 2017-01-14 18:57:40 -02:00
cnr
ef53ae5737 Reinstate missing _showInterface check 2017-01-14 13:59:06 -06:00
cnr
5ba3fac58c Check twofactor status instead of interact events 2017-01-14 01:29:37 -06:00
LCastr0
babc72a87c Fixed lore 2017-01-13 23:31:22 -06:00
samczsun
1a5a530133 Fix Evolution crash 2017-01-13 23:30:13 -06:00
cnr
66bff40040 Update StaffServer whitelist 2017-01-13 21:52:02 -06:00
cnr
bb2477676c Add missing diff from PP-Bizon fix 2017-01-13 14:24:48 -06:00
Sam
b55902f853 World events 2017-01-13 17:16:36 +00:00
cnr
d5160bf10b Don't register https scheme in BungeeRotator 2017-01-13 03:07:50 -06:00
cnr
89ccaf4323 Disable hotbar items when authenticating with 2FA 2017-01-13 01:14:31 -06:00
samczsun
a4614fe3b4 Drastically reduce BungeeRotator size (3MB!!!) 2017-01-12 23:23:11 -06:00
samczsun
251eb2e53e Let's be legal 2017-01-12 23:22:40 -06:00
samczsun
e82d1b5885 Remove spigot as a dependency from ServerData 2017-01-12 23:22:39 -06:00
cnr
cdfc19f566 Ignore canceled player interact events 2017-01-12 23:05:34 -06:00
LCastr0
2bb8023b47 Changed chest spawn animation 2017-01-12 18:20:19 -06:00
LCastr0
4a803c1482 Fixed NPE, weapon name is now back at the lore 2017-01-12 18:20:14 -06:00
cnr
8d33a49397 Use a more explicit title for classic MineStrike 2017-01-12 15:59:57 -06:00
LCastr0
85eb38032f Added minestrike chest to treasure hunt track 2017-01-12 18:50:55 -02:00
LCastr0
9385144566 Lowered the cost from 20000 to 10000 2017-01-12 16:52:36 -02:00
LCastr0
353cefe949 Added weapon name after skin name 
Changed lore and icon of MS chest
 2017-01-12 16:36:29 -02:00
Sam
d5be0f5061 Remove args to match new parameters 2017-01-12 18:04:59 +00:00
Sam
3d64319180 Missing commands 2017-01-12 18:03:40 +00:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
LCastr0
4b3b7849eb Added MS chest to customer support server 2017-01-12 15:55:15 -02:00
cnr
ac32fbb15e Add StrikeGames to MineStrike NPC's server page 2017-01-12 00:54:59 -06:00
samczsun
132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun
e72d1e51a2 Ignore bypass for testing sever motd 2017-01-11 20:29:37 -06:00
samczsun
39ba03d1b4 Convert to UtilServer.isTestServer 2017-01-11 20:29:36 -06:00
samczsun
19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
Nate Mortensen
e339b0352a Make GameComponent generic and store an instance of the Game. 2017-01-11 20:04:48 -06:00
samczsun
5c4cc48e86 More QA changes 2017-01-11 19:50:26 -06:00
samczsun
4fd92a3402 Fix remainder of parties bugs 2017-01-11 19:50:26 -06:00
samczsun
56d4ed9e11 Parties rewrite 
Basically everything got changed. Also Portal has a slightly better API
now
 2017-01-11 19:50:26 -06:00
cnr
91773de97e Don't use metadata for two-factor auth 2017-01-11 16:17:03 -06:00
Kenny
6f2705f0e4 Reduce size of bungeerotator jar 
Make use of the maven shade plugin's `minimizeJar` option to filter out
classes not explicitly mentioned, and use two artifact filters to
explicitly include classes used. Also removes the mysql driver check in
the main method as it is not necessary for this program to work.
 2017-01-11 15:46:20 -06:00
cnr
cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
xXVevzZXx
1095f8bc49 Respack links 2017-01-11 15:29:50 -06:00
xXVevzZXx
5a2ed59a38 Make Strike Games an actual game, disable Hunger and remove food from loot 2017-01-11 15:29:50 -06:00
Shaun Bennett
28a83ef722 Don't delete old client when being replaced (solves enjin listener issue) 2017-01-11 15:28:59 -06:00
samczsun
cbe238c83d Don't give book on join 2017-01-11 15:11:57 -06:00
samczsun
716c77451e Update the right titles 2017-01-11 15:11:57 -06:00
samczsun
fbaeffc96e Remove EventHandler annotation 2017-01-11 15:11:57 -06:00
samczsun
99211d5d89 Fix particles 2017-01-11 15:11:57 -06:00
samczsun
cb13fb1ccc 1.8 titles! 2017-01-11 15:11:57 -06:00
samczsun
bcea0044e8 Animated Titles! 2017-01-11 15:11:57 -06:00
Nate Mortensen
e803df6884 Fix Blink ability with Spectators 
When using blink, players are teleported away from other players
within a one block radius of them.  However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.

To fix this, Blink now ignores players in Spectator mode.  This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
 2017-01-11 15:07:48 -06:00
Nate Mortensen
9583c7abcb Run Minestrike in Adventure Mode 2017-01-11 15:07:48 -06:00
Nate Mortensen
0bb01d39b6 Fix PP-Bizon skin 2017-01-11 15:07:48 -06:00
Nate Mortensen
afaed17071 Fix kill reward for skinned knives 2017-01-11 15:07:48 -06:00
Nate Mortensen
e1aeaa8714 Add damage metadata system to CombatLog and CustomDamageEvent 
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike.  Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed.  Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
 2017-01-11 15:07:47 -06:00
Nate Mortensen
8384c47e53 Create Lifetime system for managing Listeners with a defined duration. 
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
 2017-01-11 15:07:47 -06:00
LCastr0
0a655932af IntelliJ removed an import after I commited last time 2017-01-11 15:50:53 -02:00
LCastr0
5e85f48c87 Fixed balloons still being added to chests 2017-01-11 01:54:53 -02:00
LCastr0
21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02:00
LCastr0
d3e6a094e5 Removed balloons for now, will be in the next update 
Updated cosmetics menu
Added weapon name to skin lore
 2017-01-10 21:08:03 -02:00
Sam
64026f81ff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-08 21:12:28 +00:00
Sam
0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
cnr
990c548e7b Disable Thanksgiving chickens 2017-01-06 01:06:10 -07:00
cnr
cbc5ed491c Check two-factor status for every player on login 2017-01-05 19:16:28 -07:00
cnr
96c15376aa Use default 2FA window size (3) 2017-01-05 15:20:10 -07:00
cnr
435abbba08 Allow builders to use 2FA 2017-01-05 10:48:56 -07:00
cnr
a2472f45b4 Cancel commands when authenticating with 2FA 2017-01-05 10:44:03 -07:00
cnr
fa6a60981c Return to normal hub type 2017-01-04 20:36:16 -07:00
cnr
f08068c717 Revert "Enable double XP + gems for the holidays" 
This reverts commit d3bcc77e01.
 2017-01-04 20:34:09 -07:00
cnr
3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
Sam
571840e249 Lots more changes 2017-01-02 14:40:13 +00:00
LCastr0
17bdfe6814 Started on the flying mechanics stuff 2016-12-30 12:44:49 -02:00
LCastr0
1aca03b22d Added balloons to normal chests 2016-12-30 12:17:52 -02:00
LCastr0
ef7bbfe7eb Added Balloons to omega chest 2016-12-30 12:10:26 -02:00
LCastr0
9578864f8a Added display item 2016-12-29 21:49:20 -02:00
LCastr0
9ec8835374 Fixed block balloons! 2016-12-29 21:40:02 -02:00
LCastr0
16e40c2896 Added shotgun skin 2016-12-29 19:18:09 -02:00
LCastr0
fcec0399cd Added remaining skins to chest 2016-12-29 19:08:31 -02:00
LCastr0
5f0de2e5e3 Allows 2 chests to be opened and dupes for minestrike chest 2016-12-29 18:04:24 -02:00
LCastr0
c877f20031 Added other skins, forgot this on the last commit 2016-12-29 18:00:18 -02:00
LCastr0
025a43b519 Added ms skins to their own chest, and added chest to page 2016-12-29 17:58:48 -02:00
LCastr0
36303a0fe8 Added new minestrike skins (some, at least?) 2016-12-29 17:43:50 -02:00
LCastr0
8131656ae2 Changed RankReward to have Eternal rank 2016-12-29 17:06:07 -02:00
LCastr0
7f7f3b9954 Removed thanksgiving chickens 2016-12-29 17:01:30 -02:00