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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2015-04-01 01:29:05 -07:00
commit 24e65e7384
9 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java
View File

@ -197,6 +197,7 @@ public class AprilFoolsManager extends MiniPlugin
public void setEnabled(boolean b)
{
_enabled = b;
Calendar c = Calendar.getInstance();
_enabled = b && (c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1);
}
}

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java
View File

@ -38,6 +38,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilBlock;
@ -144,6 +145,8 @@ public class Bridge extends TeamGame implements OreObsfucation
"The last team alive wins!"
});
AprilFoolsManager.Instance.setEnabled(false);
_ore = new OreHider();
// Flags

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
View File

@ -55,6 +55,8 @@ public class ChampionsDominate extends Domination
};
AprilFoolsManager.Instance.setEnabled(false);
Manager.GetDamage().UseSimpleWeaponDamage = false;
Manager.getCosmeticManager().setHideParticles(true);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java
View File

@ -56,6 +56,8 @@ public class ChampionsTDM extends TeamDeathmatch
};
AprilFoolsManager.Instance.setEnabled(false);
this.Manager.GetDamage().UseSimpleWeaponDamage = false;
Manager.getCosmeticManager().setHideParticles(true);

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java
View File

@ -12,6 +12,7 @@ import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockFromToEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilTime;
@ -47,6 +48,8 @@ public class Micro extends TeamGame
"Small game, big strategy!",
});
AprilFoolsManager.Instance.setEnabled(false);
this.StrictAntiHack = true;
this.TeamArmor = true;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -57,6 +57,7 @@ import org.bukkit.scoreboard.Team;
import org.bukkit.scoreboard.TeamNameTagVisibility;
import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
@ -109,7 +110,6 @@ import nautilus.game.arcade.stats.KillFastStatTracker;
import nautilus.game.arcade.stats.KillReasonStatTracker;
import nautilus.game.arcade.stats.KillsWithConditionStatTracker;
import nautilus.game.arcade.stats.MineStrikeLastAliveKillStatTracker;
import net.minecraft.server.v1_7_R4.EntityArrow;
public class MineStrike extends TeamGame
@ -249,6 +249,8 @@ public class MineStrike extends TeamGame
C.cRed + "Al'Jaha" + C.cWhite + " Kill the Counter-Terrorists",
});
AprilFoolsManager.Instance.setEnabled(false);
_shopManager = new ShopManager(this);
this.StrictAntiHack = true;

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java
View File

@ -34,6 +34,7 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilMath;
@ -111,6 +112,8 @@ public class Paintball extends TeamGame
"Last team alive wins!"
});
AprilFoolsManager.Instance.setEnabled(false);
this.StrictAntiHack = true;
this.HungerSet = 20;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java
View File

@ -29,10 +29,10 @@ import org.bukkit.event.player.PlayerEvent;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerItemHeldEvent;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilGear;
import mineplex.core.common.util.UtilInv;
@ -142,6 +142,8 @@ public class SheepGame extends TeamGame
"Most sheep at 5 minutes wins!"
});
AprilFoolsManager.Instance.setEnabled(false);
this.DeathOut = false;
this.DeathSpectateSecs = 6;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import mineplex.core.aprilfools.AprilFoolsManager;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
@ -163,6 +164,7 @@ public class GameCreationManager implements Listener
// Manager.GetAntiStack().SetEnabled(true);
Manager.getCosmeticManager().setHideParticles(false);
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName);
AprilFoolsManager.Instance.setEnabled(true);
HashMap<String, ChatColor> pastTeams = null;