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

Tweak calendar used by hub to ensure region equality, and fix some spelling/grammar

Browse Source
This commit is contained in:
AlexTheCoder 2017-11-30 23:52:01 -05:00 committed by Alexander Meech
parent 3bc9476fd8
commit ff05953c1d
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/christmas/ParticleBlizzard.java
View File

@ -29,7 +29,7 @@ public class ParticleBlizzard extends ParticleGadget
public ParticleBlizzard(GadgetManager manager)
{
super(manager, "Blizzard Aura",
UtilText.splitLineToArray(C.cGray + "It's cold outside, there's no kind of atmosphere?", LineFormat.LORE),
UtilText.splitLineToArray(C.cGray + "How did this much snow get through?", LineFormat.LORE),
CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.ICE, (byte) 0);
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/FrostBreathTaunt.java
View File

@ -41,7 +41,7 @@ public class FrostBreathTaunt extends TauntGadget
public FrostBreathTaunt(GadgetManager manager)
{
super(manager, "Frost Breath Taunt",
UtilText.splitLineToArray(C.cGray + "Send shiver's down the spine's of your enemies with this chilling taunt.", LineFormat.LORE),
UtilText.splitLineToArray(C.cGray + "Send shivers down the spines of your enemies with this chilling taunt.", LineFormat.LORE),
CostConstants.FOUND_IN_GINGERBREAD_CHESTS, Material.PACKED_ICE, (byte) 0);
}

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

@ -25,7 +25,7 @@ import mineplex.core.treasure.reward.TreasureRewardManager;
import mineplex.core.treasure.types.AncientTreasure;
import mineplex.core.treasure.types.ChristmasTreasure;
import mineplex.core.treasure.types.FreedomTreasure;
import mineplex.core.treasure.types.GingerbeardTreasure;
import mineplex.core.treasure.types.GingerbreadTreasure;
import mineplex.core.treasure.types.IlluminatedTreasure;
import mineplex.core.treasure.types.LoveTreasure;
import mineplex.core.treasure.types.MOBATreasure;
@ -81,7 +81,7 @@ public class TreasureManager extends MiniPlugin
addTreasureType(new OmegaTreasure());
addTreasureType(new MinestrikeTreasure());
addTreasureType(new MOBATreasure());
addTreasureType(new GingerbeardTreasure());
addTreasureType(new GingerbreadTreasure());
addTreasureType(new TrickOrTreatTreasure2017());
addTreasureType(new TrickOrTreatTreasure2016());
addTreasureType(new ThankfulTreasure());

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

@ -24,10 +24,10 @@ import mineplex.core.reward.RewardType;
import mineplex.core.treasure.animation.animations.GingerbreadChestAnimation;
import mineplex.core.treasure.reward.RewardRarity;
public class GingerbeardTreasure extends Treasure
public class GingerbreadTreasure extends Treasure
{
public GingerbeardTreasure()
public GingerbreadTreasure()
{
super(TreasureType.GINGERBREAD);

6
Plugins/Mineplex.Hub/src/mineplex/hub/plugin/ChristmasHubPlugin.java
View File

@ -1,7 +1,9 @@
package mineplex.hub.plugin;
import java.time.ZoneId;
import java.util.Calendar;
import java.util.List;
import java.util.TimeZone;
import org.bukkit.ChatColor;
import org.bukkit.event.EventHandler;
@ -25,7 +27,7 @@ public class ChristmasHubPlugin extends HubPlugin
static
{
Calendar calendar = Calendar.getInstance();
Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("America/New_York")));
calendar.set(2017, Calendar.DECEMBER, 8, 6, 0);
RELEASE_DATE = calendar.getTimeInMillis();
}
@ -104,6 +106,6 @@ public class ChristmasHubPlugin extends HubPlugin
private long getTimeUntilRelease()
{
return RELEASE_DATE - System.currentTimeMillis();
return RELEASE_DATE - Calendar.getInstance(TimeZone.getTimeZone(ZoneId.of("America/New_York"))).getTimeInMillis();
}
}