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

Disable all the christmas stuff

Browse Source
This commit is contained in:
Sam 2018-01-13 17:06:02 +00:00 committed by Alexander Meech
parent 76eb530b5f
commit 7338f20d81
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/treasure/types/GingerbreadTreasure.java
View File

@ -34,10 +34,6 @@ public class GingerbreadTreasure extends Treasure
setAnimation(treasureLocation -> new GingerbreadChestAnimation(this, treasureLocation));
setRewards(RewardType.GINGERBREAD_CHEST);
setRewardsPerChest(1);
setPurchasable(20000);
purchasableFromStore();
setFeaturedChest();
enabledByDefault();
}
@Override

2
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
View File

@ -126,7 +126,7 @@ public class Hub extends JavaPlugin implements IRelation
creature.SetDisableCustomDrops(true);
NpcManager npcManager = new NpcManager(this, creature);
InventoryManager inventoryManager = new InventoryManager(this, clientManager);
CastleManager castleManager = new CastleManager(this, clientManager, hologramManager, false);
CastleManager castleManager = new CastleManager(this, clientManager, hologramManager, true);
PetManager petManager = new PetManager(this, clientManager, donationManager, inventoryManager, disguiseManager, creature, blockRestore);
PollManager pollManager = new PollManager(this, clientManager, donationManager);

18
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -2,6 +2,14 @@ package mineplex.hub;
import java.util.UUID;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.HoverEvent.Action;
import net.md_5.bungee.api.chat.TextComponent;
import net.minecraft.server.v1_8_R3.EntityInsentient;
import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R3.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
@ -93,20 +101,12 @@ import mineplex.hub.modules.salesannouncements.SalesAnnouncementManager;
import mineplex.hub.news.NewsManager;
import mineplex.hub.player.CreativeManager;
import mineplex.hub.player.HubPlayerManager;
import mineplex.hub.plugin.ChristmasHubPlugin;
import mineplex.hub.plugin.HubPlugin;
import mineplex.hub.scoreboard.HubScoreboard;
import mineplex.hub.world.HubWorldManager;
import mineplex.hub.world.WorldDataModule;
import mineplex.minecraft.game.core.combat.DeathMessageType;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.HoverEvent.Action;
import net.md_5.bungee.api.chat.TextComponent;
import net.minecraft.server.v1_8_R3.EntityInsentient;
import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R3.WorldServer;
public class HubManager extends MiniClientPlugin<HubClient> implements IChatMessageFormatter
{
@ -238,7 +238,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
//require(StaffBuild.class);
//require(HubPortalManager.class);
_hubPlugin = new ChristmasHubPlugin();
_hubPlugin = new HubPlugin();
// Unload chunks every 60 seconds
new BukkitRunnable()