skywalker3200/MobArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whoops! Fixed something in ArenaManager.java. Thanks desmin!

Browse Source
This commit is contained in:
Garbage Mule
2011-06-05 06:51:32 +02:00
parent faaff515a1
commit 09ff211987
6 changed files with 7 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobArena.jar
BIN
View File
Binary file not shown.
src/com/garbagemule/MobArena/ArenaManager.java
+7 -7
View File
@@ -109,13 +109,13 @@ public class ArenaManager
dCreepers = MAUtils.getDistribution("creepers");
dWolves = MAUtils.getDistribution("wolves");
dPigZombies = MAUtils.getDistribution("poweredcreepers", "special");
dPigZombies = MAUtils.getDistribution("zombiepigmen", "special");
dSlimes = MAUtils.getDistribution("slimes", "special");
dMonsters = MAUtils.getDistribution("humans", "special");
dAngryWolves = MAUtils.getDistribution("angrywolves", "special");
dGiants = MAUtils.getDistribution("giants", "special");
dGhasts = MAUtils.getDistribution("ghasts", "special");
dPoweredCreepers = MAUtils.getDistribution("poweredcreepers", "special");
dPigZombies = MAUtils.getDistribution("zombiepigmen", "special");
dSlimes = MAUtils.getDistribution("slimes", "special");
dMonsters = MAUtils.getDistribution("humans", "special");
dAngryWolves = MAUtils.getDistribution("angrywolves", "special");
dGiants = MAUtils.getDistribution("giants", "special");
dGhasts = MAUtils.getDistribution("ghasts", "special");
}
// Convenience variables.
src/com/garbagemule/MobArena/MADropListener.java
-34
View File
@@ -1,34 +0,0 @@
package com.garbagemule.MobArena;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerDropItemEvent;
import org.bukkit.event.player.PlayerBucketEmptyEvent;
/**
* This listener prevents players from sharing class-specific
* items (read: cheating) before the arena session starts.
*/
// TO-DO: Merge with MASignListener and MAReadyListener into MALobbyListener
public class MADropListener extends PlayerListener
{
private MobArena plugin;
public MADropListener(MobArena instance)
{
plugin = instance;
}
public void onPlayerDropItem(PlayerDropItemEvent event)
{
Player p = event.getPlayer();
if (ArenaManager.playerSet.contains(p))
{
if (ArenaManager.isRunning)
return;
ArenaManager.tellPlayer(p, "No sharing before the arena starts!");
event.setCancelled(true);
}
}
}
src/com/garbagemule/MobArena/MAReadyListener.java
-41
View File
@@ -1,41 +0,0 @@
package com.garbagemule.MobArena;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerInteractEvent;
/**
* This listener flags players as ready, if they are in the arena
* session, and hit an iron block (id: 42).
*/
// TO-DO: Merge with MASignListener and MADropListener into MALobbyListener
// TO-DO: Let server host decide which type of block is the "readyblock".
public class MAReadyListener extends PlayerListener
{
private MobArena plugin;
public MAReadyListener(MobArena instance)
{
plugin = instance;
}
public void onPlayerInteract(PlayerInteractEvent event)
{
Player p = event.getPlayer();
if (ArenaManager.playerSet.contains(p))
{
if ((event.hasBlock()) && (event.getClickedBlock().getTypeId() == 42))
{
if (ArenaManager.classMap.containsKey(p))
{
ArenaManager.tellPlayer(p, "You have been flagged as ready!");
ArenaManager.playerReady(p);
}
else
{
ArenaManager.tellPlayer(p, "You must first pick a class!");
}
}
}
}
}
src/com/garbagemule/MobArena/MASignListener.java
-62
View File
@@ -1,62 +0,0 @@
package com.garbagemule.MobArena;
import org.bukkit.block.Sign;
import org.bukkit.event.Event.Result;
import org.bukkit.event.block.Action;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerInteractEvent;
/**
* This listener handles the class assignments. When a player in
* the arena session hits a class sign, they will be given their
* class-specific items.
*/
// TO-DO: Merge with MAReadyListener and MADropListener into MALobbyListener
public class MASignListener extends PlayerListener
{
private MobArena plugin;
public MASignListener(MobArena instance)
{
plugin = instance;
}
public void onPlayerInteract(PlayerInteractEvent event)
{
// Only do these checks if the arena isn't running.
if (!ArenaManager.isRunning)
{
Action a = event.getAction();
Player p = event.getPlayer();
// Check if player is trying to use an item.
// TO-DO: Find a way to allow right-click. Perhaps just remove the return;
if ((a == Action.RIGHT_CLICK_AIR) || (a == Action.RIGHT_CLICK_BLOCK))
{
if (ArenaManager.playerSet.contains(p))
event.setUseItemInHand(Result.DENY);
return;
}
// Check if the clicked block is one of the class signs.
if ((event.hasBlock()) && (event.getClickedBlock().getState() instanceof Sign))
{
// Cast the block to a sign to get the text on it.
Sign sign = (Sign) event.getClickedBlock().getState();
if (ArenaManager.playerSet.contains(p))
{
// Check if the first line of the sign is a class name.
String className = sign.getLine(0);
if (ArenaManager.classes.contains(className))
{
// Set the player's class.
ArenaManager.assignClass(p, className);
ArenaManager.tellPlayer(p, "You have chosen " + className + " as your class!");
}
}
}
}
}
}
src/com/garbagemule/MobArena/MAUtils.java
-2
View File
@@ -110,7 +110,6 @@ public class MAUtils
{
id = Integer.parseInt(item[0]);
stack = new ItemStack(id, amount);
//if (!reward && Arrays.asList(SWORDS_ID).contains(id))
if (!reward && SWORDS_ID.contains(id))
stack.setDurability((short)-3276);
}
@@ -118,7 +117,6 @@ public class MAUtils
{
stack = makeItemStack(item[0], amount);
if (stack == null) continue;
//if (!reward && Arrays.asList(SWORDS_TYPE).contains(stack.getType()))
if (!reward && SWORDS_ID.contains(stack.getTypeId()))
stack.setDurability((short)-3276);
}