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

Loot tweaks

Browse Source 
Music fixes
some bug fixes
This commit is contained in:
Chiss 2014-09-19 18:01:38 +10:00
parent ed7eeab1a7
commit 91037384f9
9 changed files with 126 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -405,4 +406,20 @@ public class GadgetManager extends MiniPlugin
}
}
}
public boolean canPlaySongAt(Location location)
{
for (Gadget gadget : _gadgets.get(GadgetType.MusicDisc))
{
if (gadget instanceof MusicGadget)
{
if (!((MusicGadget)gadget).canPlayAt(location))
{
return false;
}
}
}
return true;
}
}

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/SongData.java
View File

@ -23,6 +23,10 @@ public class SongData
{
if (System.currentTimeMillis() > EndTime)
{
//Dont end until Jukebox cleaned
if (Block.getType() != Material.JUKEBOX && Block.getType() != Material.AIR)
return false;
Block.setType(Material.AIR);
return true;
}

42
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java
View File

@ -4,9 +4,11 @@ import java.util.ArrayList;
import java.util.Iterator;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.event.GadgetActivateEvent;
import mineplex.core.gadget.event.GadgetBlockEvent;
import mineplex.core.gadget.gadgets.SongData;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
@ -14,10 +16,11 @@ import mineplex.core.updater.event.UpdateEvent;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
public class MusicGadget extends Gadget
{
@ -46,6 +49,12 @@ public class MusicGadget extends Gadget
return;
}
if (!Manager.canPlaySongAt(player.getLocation()))
{
UtilPlayer.message(player, F.main("Music", "There is already another song playing nearby."));
return;
}
if (!Recharge.Instance.use(player, "Play Disc", _duration, true, false))
return;
@ -82,4 +91,35 @@ public class MusicGadget extends Gadget
songIterator.remove();
}
}
@EventHandler
public void gadgetBlockChange(GadgetBlockEvent event)
{
for (Iterator<Block> iterator = event.getBlocks().iterator(); iterator.hasNext();)
{
Block block = iterator.next();
for (SongData data : _songs)
{
if (data.Block.equals(block))
{
iterator.remove();
break;
}
}
}
}
public boolean canPlayAt(Location location)
{
for (SongData data : _songs)
{
if (UtilMath.offset(data.Block.getLocation(), location) < 48)
{
return false;
}
}
return true;
}
}

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

@ -67,8 +67,8 @@ public class RewardManager
//Increase Value
if (_doubleGadgetValue)
{
minValue *= 2;
maxValue *= 2;
minValue *= 1.5;
maxValue *= 1.5;
}
// Gadgets
@ -111,8 +111,8 @@ public class RewardManager
//Increase Value
if (_doubleGadgetValue)
{
minValue *= 2;
maxValue *= 2;
minValue *= 1.5;
maxValue *= 1.5;
}
// Gadgets

26
Plugins/Mineplex.Core/src/mineplex/core/treasure/Treasure.java
View File

@ -388,17 +388,21 @@ public class Treasure
public boolean containsBlock(Block block)
{
if (_wallsBlockInfo.contains(block))
return true;
if (_outerRingBlockInfo.contains(block))
return true;
if (_centerBlockInfo.contains(block))
return true;
if (_chestBlockInfo.contains(block))
return true;
for (BlockInfo info : _wallsBlockInfo)
if (info.getBlock().equals(block))
return true;
for (BlockInfo info : _outerRingBlockInfo)
if (info.getBlock().equals(block))
return true;
for (BlockInfo info : _centerBlockInfo)
if (info.getBlock().equals(block))
return true;
for (BlockInfo info : _chestBlockInfo)
if (info.getBlock().equals(block))
return true;
return false;
}

2
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java
View File

@ -14,7 +14,7 @@ public class TreasureKey extends SalesPackageBase
{
public TreasureKey()
{
super("Treasure Key", Material.LEVER, (byte) 0, new String[] { ChatColor.RESET + "Used to open Treasure Chests" }, 1000);
super("Treasure Key", Material.TRIPWIRE_HOOK, (byte) 0, new String[] { ChatColor.RESET + "Used to open Treasure Chests" }, 1000);
KnownPackage = false;
OneTimePurchaseOnly = false;

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

@ -361,11 +361,11 @@ public class TreasureManager extends MiniPlugin
public void preventGadgetBlockEvent(GadgetBlockEvent event)
{
List<Block> blocks = event.getBlocks();
for (Block block : blocks)
{
for (Treasure treasure : _playerTreasureMap.values())
{
{
if (treasure.containsBlock(block))
{
event.setCancelled(true);

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ParkourManager.java
View File

@ -400,9 +400,11 @@ public class ParkourManager extends MiniPlugin
{
for (Iterator<Block> iterator = event.getBlocks().iterator(); iterator.hasNext();)
{
Block block = iterator.next();
for (ParkourData data : _parkour)
{
if (data.InBoundary(iterator.next().getLocation()))
if (data.InBoundary(block.getLocation()))
{
iterator.remove();
break;

45
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLootManager.java
View File

@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.FireworkEffect;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -18,6 +19,7 @@ import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilFirework;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTitle;
import mineplex.core.pet.PetManager;
@ -55,11 +57,11 @@ public class GameLootManager implements Listener
//Chest
_rewardManager.addReward(new InventoryReward(_rewardManager, Manager.getInventoryManager(), "Treasure Chest", "Treasure Chest", 1, 1,
new ItemStack(Material.CHEST), RewardRarity.COMMON, 2));
new ItemStack(Material.CHEST), RewardRarity.COMMON, 3));
//Key
_rewardManager.addReward(new InventoryReward(_rewardManager, Manager.getInventoryManager(), "Treasure Key", "Treasure Key", 1, 1,
new ItemStack(Material.DIAMOND), RewardRarity.UNCOMMON, 500));
new ItemStack(Material.DIAMOND), RewardRarity.UNCOMMON, 600));
}
@EventHandler
@ -120,18 +122,24 @@ public class GameLootManager implements Listener
String outputName = reward.getRarity().getColor() + rewardData.getFriendlyName();
String rarityName = "";
if (reward.getRarity() != RewardRarity.COMMON)
rarityName = " " + reward.getRarity().getColor() + reward.getRarity().getName();
//Log
System.out.println(F.name(player.getName()) + " found " + reward.getRarity().getName() + " treasure " + outputName);
System.out.println(F.name(player.getName()) + " found" + rarityName + " " + outputName);
//Self Display
UtilTitle.display(C.cDGreen + C.Bold + "Loot", "You found " + outputName, 20, 120, 20, player);
UtilTitle.display(C.cGreen + "Game Loot", "You found " + outputName, 20, 120, 20, player);
//if (reward.getRarity() == RewardRarity.COMMON)
// UtilPlayer.message(player, F.main("Loot", "You found " + rarityName + outputName));
Random _random = new Random();
//Announce
if (reward.getRarity() != RewardRarity.COMMON)
//if (reward.getRarity() != RewardRarity.COMMON)
{
Bukkit.broadcastMessage(F.main("Loot", F.name(player.getName()) + " found " + reward.getRarity().getName() + " treasure " + outputName));
Bukkit.broadcastMessage(F.main("Loot", F.name(player.getName()) + " found" + rarityName + " " + outputName));
}
//Effect
@ -148,11 +156,15 @@ public class GameLootManager implements Listener
{
FireworkEffect effect = FireworkEffect.builder().with(FireworkEffect.Type.BALL).withColor(Color.YELLOW).withFade(Color.WHITE).build();
UtilFirework.playFirework(player.getEyeLocation(), effect);
player.getWorld().playSound(player.getEyeLocation().add(0.5, 0.5, 0.5), Sound.WITHER_SPAWN, 5F, 1.2F);
}
else if (reward.getRarity() == RewardRarity.LEGENDARY)
{
FireworkEffect effect = FireworkEffect.builder().with(FireworkEffect.Type.BALL_LARGE).withColor(Color.RED).withFade(Color.BLACK).build();
UtilFirework.playFirework(player.getEyeLocation(), effect);
player.getWorld().playSound(player.getEyeLocation().add(0.5, 0.5, 0.5), Sound.ENDERDRAGON_DEATH, 10F, 2.0F);
}
}
@ -169,5 +181,26 @@ public class GameLootManager implements Listener
giveReward(event.getPlayer());
event.setCancelled(true);
}
if (event.getMessage().startsWith("/lootdebug100"))
{
event.getPlayer().sendMessage(C.cGreen + C.Bold + "Loot Debug 100...");
final Player fPlayer = event.getPlayer();
for (int i=0 ; i<100 ; i++)
{
UtilServer.getServer().getScheduler().runTaskLater(Manager.GetPlugin(), new Runnable()
{
@Override
public void run()
{
giveReward(fPlayer);
}
}, 2 * i);
}
event.setCancelled(true);
}
}
}