JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed hover effect

Browse Source 
Fixed love chest lore being purple
This commit is contained in:
LCastr0 2017-02-08 15:44:05 -02:00
parent 5902e82d58
commit 22f6f243aa
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
View File

@ -209,6 +209,12 @@ public class Treasure
block.getLocation().add(.5 + rX, .7, .5 + rZ)); block.getLocation().add(.5 + rX, .7, .5 + rZ));
coloredParticle.display(); coloredParticle.display();
} }
else if (_treasureType == TreasureType.LOVE_CHEST)
{
int r = (int) (Math.random() * 2);
double rX = Math.random() * 2 - 1, rZ = Math.random() * 2 - 1;
UtilParticle.PlayParticle(type, block.getLocation().add(.5 + rX, .7, .5 + rZ), .5f, .5f, .5f, .25f, 1, ViewDist.NORMAL);
}
else else
{ {
UtilParticle.PlayParticle(type, block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0.2F, 0, UtilParticle.PlayParticle(type, block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0.2F, 0,

12
Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/BlockChangeAnimation.java
View File

@ -223,6 +223,18 @@ public class BlockChangeAnimation extends Animation
} }
} }
} }
else if (getTreasure().getTreasureType() == TreasureType.LOVE_CHEST)
{
for (Block c : _chests)
{
if (c.equals(b))
{
_blockInfoList.add(new BlockInfo(b));
b.setType(Material.WOOL);
b.setData((byte) 6);
}
}
}
} }
} }

2
Plugins/Mineplex.Core/src/mineplex/core/treasure/animation/ChestSpawnAnimation.java
View File

@ -117,7 +117,7 @@ public class ChestSpawnAnimation extends Animation
_particleLocation.add(_particleDirection); _particleLocation.add(_particleDirection);
//Play Particles //Play Particles
if (getTreasure().getTreasureType() == TreasureType.OLD) if (getTreasure().getTreasureType() == TreasureType.OLD || getTreasure().getTreasureType() == TreasureType.LOVE_CHEST)
{ {
UtilParticle.PlayParticle(getTreasure().getTreasureType().getStyle().getSecondaryParticle(), _centerLocation, 0.1f, 0.1f, 0.1f, 0, 1, UtilParticle.PlayParticle(getTreasure().getTreasureType().getStyle().getSecondaryParticle(), _centerLocation, 0.1f, 0.1f, 0.1f, 0, 1,
ViewDist.NORMAL, UtilServer.getPlayers()); ViewDist.NORMAL, UtilServer.getPlayers());

2
Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
View File

@ -387,7 +387,7 @@ public class TreasurePage extends ShopPageBase<TreasureManager, TreasureShop>
lovechestLore.add(" "); lovechestLore.add(" ");
lovechestLore.add(F.value("Love Chests Owned", "" + loveCount)); lovechestLore.add(F.value("Love Chests Owned", "" + loveCount));
lovechestLore.add(" "); lovechestLore.add(" ");
lovechestLore.addAll(UtilText.splitLines(new String[]{"Cupid and his hunters have searched far and wide to collect a whole bunch of lovey dovey items. 6 items, no duplicates."}, LineFormat.LORE)); lovechestLore.addAll(UtilText.splitLines(new String[]{C.cGray + "Cupid and his hunters have searched far and wide to collect a whole bunch of lovey dovey items. 6 items, no duplicates."}, LineFormat.LORE));
lovechestLore.add(" "); lovechestLore.add(" ");
if (loveCount > 0) if (loveCount > 0)
{ {