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

final xmas Updates

Browse Source 
xmas hub
This commit is contained in:
Chiss 2014-12-12 19:44:04 +11:00
parent 9a16616e6c
commit 4fd6ed80c4
7 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlockText.java
View File

@ -139,21 +139,24 @@ public class UtilBlockText
if (align == TextAlign.CENTER) if (align == TextAlign.CENTER)
for (int i=-64 ; i<=64 ; i++) for (int i=-64 ; i<=64 ; i++)
{ {
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true); if (world.getBlockAt(bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ()).getTypeId() == id)
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true);
} }
if (align == TextAlign.LEFT) if (align == TextAlign.LEFT)
for (int i=0 ; i<=128 ; i++) for (int i=0 ; i<=128 ; i++)
{ {
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true); if (world.getBlockAt(bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ()).getTypeId() == id)
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true);
} }
if (align == TextAlign.RIGHT) if (align == TextAlign.RIGHT)
for (int i=-128 ; i<=0 ; i++) for (int i=-128 ; i<=0 ; i++)
{ {
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true); if (world.getBlockAt(bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ()).getTypeId() == id)
MapUtil.ChunkBlockSet(world, bX + i * face.getModX(), bY + i * face.getModY(), bZ + i * face.getModZ(), 0, (byte)0, true);
} }

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

@ -105,7 +105,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
public class HubManager extends MiniClientPlugin<HubClient> public class HubManager extends MiniClientPlugin<HubClient>
{ {
// ☃❅ Snowman! // ☃❅ Snowman!
public HubType Type = HubType.Normal; public HubType Type = HubType.Christmas;
private BlockRestore _blockRestore; private BlockRestore _blockRestore;
private CoreClientManager _clientManager; private CoreClientManager _clientManager;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java
View File

@ -389,7 +389,7 @@ public class Christmas extends SoloGame
public void SantaSay(String string, ChristmasAudio audio) public void SantaSay(String string, ChristmasAudio audio)
{ {
Announce(C.cRed + C.Bold + "Santa: " + ChatColor.RESET + C.cYellow + string); Announce(C.cRed + C.Bold + "Santa: " + ChatColor.RESET + C.cYellow + string, false);
//Audio //Audio
if (audio != null && UtilTime.elapsed(_santaSayTime, 1500)) if (audio != null && UtilTime.elapsed(_santaSayTime, 1500))
@ -412,7 +412,7 @@ public class Christmas extends SoloGame
{ {
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
{ {
UtilPlayer.message(player, C.cDGreen + C.Bold + name + ": " + ChatColor.RESET + C.cGreen + string); UtilPlayer.message(player, C.cDGreen + C.Bold + name + ": " + ChatColor.RESET + C.cGreen + string, false);
if (audio != null) if (audio != null)
{ {

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/SnowmanBoss.java
View File

@ -51,8 +51,8 @@ public class SnowmanBoss
_minions.add(new SnowmanMinion(_spawn.getWorld().spawn(_spawn, Snowman.class))); _minions.add(new SnowmanMinion(_spawn.getWorld().spawn(_spawn, Snowman.class)));
_heart = _spawn.getWorld().spawn(_spawn, IronGolem.class); _heart = _spawn.getWorld().spawn(_spawn, IronGolem.class);
_heart.setMaxHealth(1500); _heart.setMaxHealth(1000);
_heart.setHealth(1500); _heart.setHealth(1000);
UtilEnt.Vegetate(_heart); UtilEnt.Vegetate(_heart);
Host.CreatureAllowOverride = false; Host.CreatureAllowOverride = false;
@ -75,8 +75,19 @@ public class SnowmanBoss
if (Host.GetPlayers(true).isEmpty()) if (Host.GetPlayers(true).isEmpty())
return; return;
Entity ent = _heart; //Count Size
int size = 0;
Entity bottom = _heart;
while (bottom.getVehicle() != null)
{
bottom = bottom.getVehicle();
size++;
}
if (size < 3)
return;
//Throw Snowballs
Entity ent = _heart;
while (ent.getVehicle() != null) while (ent.getVehicle() != null)
{ {
ent = ent.getVehicle(); ent = ent.getVehicle();

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part1.java
View File

@ -114,7 +114,7 @@ public class Part1 extends Part
private void UpdateSkeleton() private void UpdateSkeleton()
{ {
if (_exploded < 0) if (_ignited < 0)
return; return;
if (GetCreatures().size() > 40) if (GetCreatures().size() > 40)

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/parts/Part3.java
View File

@ -219,7 +219,7 @@ public class Part3 extends Part
return; return;
if (event.GetDamageePlayer() != null) if (event.GetDamageePlayer() != null)
event.AddMod("Christmas Part 3", "Snowball", 3, false); event.AddMod("Christmas Part 3", "Snowball", 2, false);
else else
event.SetCancelled("Snowball vs Mobs"); event.SetCancelled("Snowball vs Mobs");
} }