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

Fix merge issues

Browse Source
This commit is contained in:
Shaun Bennett 2016-05-24 19:14:52 +10:00
parent 1377e6724f
commit 434ada2e86
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
View File

@ -1555,7 +1555,7 @@ public class UtilBlock
BlockPosition pos = new BlockPosition(x, y, z);
IBlockData ibd = net.minecraft.server.v1_8_R3.Block.getById(type).fromLegacyData(data);
chunk.a(pos, ibd);
nmsWorld.notify(pos);
// nmsWorld.notify(pos);
if(_quickChangeRecorder != null)
{

1
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
View File

@ -79,6 +79,7 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
int tauntSlot = 49;//slots[11];
int winEffectSlot = 51;
int gameModifierSlot = 53;
int boosterSlot = 52;// TODO
EnumMap<GadgetType, Integer> ownedCount = new EnumMap<GadgetType, Integer>(GadgetType.class);
EnumMap<GadgetType, Integer> maxCount = new EnumMap<GadgetType, Integer>(GadgetType.class);

1
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -297,7 +297,6 @@ public class GadgetManager extends MiniPlugin
addGadget(new ItemBow(this));
addGadget(new ItemLovePotion(this));
addGadget(new ItemFlowerGift(this));
addGadget(new ItemGemBooster(this));
// Costume
addGadget(new OutfitRaveSuitHelmet(this));

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ban/ui/ClansBanPage.java
View File

@ -96,7 +96,7 @@ public class ClansBanPage extends ShopPageBase<ClansBanManager, ClansBanShop>
.addLore(C.cGray + "Is Disabled: " + C.cYellow + (ban.isRemoved() ? "Yes" : "No"))
.addLore(ban.isActive() ? " " : null)
.addLore(ban.isActive() ? C.cDAqua + "Left-Click to disable ban" : null)
.addDullEnchantment(ban.isActive())
.setGlow(ban.isActive())
.build();
addButton(slot++, item, (player, click) -> {