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

This commit is contained in:
Jonathan Williams 2014-12-13 20:22:48 -05:00
parent 28dc4059a4 0198120c70
commit 718e02047e
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
View File

@ -176,8 +176,8 @@ public class RewardManager
new ItemStack(2264), rarity, 25));
addReward(new UnknownPackageReward(donationManager, "Ward Disc", "Ward Disc",
new ItemStack(2265), rarity, 25));
addReward(new UnknownPackageReward(donationManager, "11 Disc", "11 Disc",
new ItemStack(2266), rarity, 25));
// addReward(new UnknownPackageReward(donationManager, "11 Disc", "11 Disc",
// new ItemStack(2266), rarity, 25));
addReward(new UnknownPackageReward(donationManager, "Wait Disc", "Wait Disc",
new ItemStack(2267), rarity, 25));
}

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

@ -55,6 +55,8 @@ public class PumpkinKing
_ent.setCustomName("The Pumpkin King");
_ent.setCustomNameVisible(true);
_ent.setRemoveWhenFarAway(false);
_ent.getWorld().strikeLightningEffect(_ent.getLocation());
}

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

@ -16,6 +16,7 @@ import nautilus.game.arcade.game.games.christmas.ChristmasAudio;
import nautilus.game.arcade.game.games.christmas.content.*;
import net.minecraft.server.v1_7_R4.EntityCreature;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.EntityEffect;
import org.bukkit.Location;
@ -192,12 +193,20 @@ public class Part5 extends Part
//Teleport
for (int i=0 ; i<Host.GetPlayers(true).size() ; i++)
{
Player player = Host.GetPlayers(true).get(i);
final Player player = Host.GetPlayers(true).get(i);
final int index = i;
player.leaveVehicle();
player.teleport(_playerSpawns.get(i%_playerSpawns.size()));
player.playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 1f);
Bukkit.getServer().getScheduler().runTaskLater(Host.Manager.GetPlugin(), new Runnable()
{
@Override
public void run()
{
player.leaveVehicle();
player.teleport(_playerSpawns.get(index%_playerSpawns.size()));
player.playSound(player.getLocation(), Sound.ZOMBIE_UNFECT, 2f, 1f);
}
}, i*2);
}
}
else if (_g && !_h && UtilTime.elapsed(_dialogueDelay, _delayTime - 1000))