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 2014-11-21 18:30:38 -08:00
commit 390c0dfff3
5 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
View File

@ -238,10 +238,12 @@ public class UtilBlock
blockUseSet.add((byte)69); //Lever blockUseSet.add((byte)69); //Lever
blockUseSet.add((byte)71); //Iron Door blockUseSet.add((byte)71); //Iron Door
blockUseSet.add((byte)77); //Button blockUseSet.add((byte)77); //Button
blockUseSet.add((byte)85); //Fence (stupid minecraft)
blockUseSet.add((byte)93); //Repeater blockUseSet.add((byte)93); //Repeater
blockUseSet.add((byte)94); //Repeater blockUseSet.add((byte)94); //Repeater
blockUseSet.add((byte)96); //Trapdoor blockUseSet.add((byte)96); //Trapdoor
blockUseSet.add((byte)107); //Fence Gate blockUseSet.add((byte)107); //Fence Gate
blockUseSet.add((byte)113); //Nether Fence (stupid minecraft)
blockUseSet.add((byte)116); //Enchantment Table blockUseSet.add((byte)116); //Enchantment Table
blockUseSet.add((byte)117); //Brewing Stand blockUseSet.add((byte)117); //Brewing Stand
blockUseSet.add((byte)130); //Ender Chest blockUseSet.add((byte)130); //Ender Chest
@ -249,6 +251,22 @@ public class UtilBlock
blockUseSet.add((byte)146); //Trapped Chest blockUseSet.add((byte)146); //Trapped Chest
blockUseSet.add((byte)154); //Hopper blockUseSet.add((byte)154); //Hopper
blockUseSet.add((byte)158); //Dropper blockUseSet.add((byte)158); //Dropper
blockUseSet.add((byte)184); //Fences/Gates
blockUseSet.add((byte)185); //Fences/Gates
blockUseSet.add((byte)186); //Fences/Gates
blockUseSet.add((byte)187); //Fences/Gates
blockUseSet.add((byte)188); //Fences/Gates
blockUseSet.add((byte)189); //Fences/Gates
blockUseSet.add((byte)190); //Fences/Gates
blockUseSet.add((byte)191); //Fences/Gates
blockUseSet.add((byte)192); //Fences/Gates
blockUseSet.add((byte)193); //Wood Doors
blockUseSet.add((byte)194); //Wood Doors
blockUseSet.add((byte)195); //Wood Doors
blockUseSet.add((byte)196); //Wood Doors
blockUseSet.add((byte)197); //Wood Doors
} }
return blockUseSet.contains(block); return blockUseSet.contains(block);

12
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java
View File

@ -219,6 +219,18 @@ public class AxeThrow extends SkillActive implements IThrown
@Override @Override
public void Reset(Player player) public void Reset(Player player)
{ {
Iterator<Item> i = _thrown.keySet().iterator();
while (i.hasNext())
{
Item item = i.next();
Player thrower = _thrown.get(item);
if (player.equals(thrower))
{
i.remove();
item.remove();
}
}
} }
} }

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/SkillFactory.java
View File

@ -171,7 +171,7 @@ public class SkillFactory extends MiniPlugin implements ISkillFactory
AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword, AddSkill(new Illusion(this, "Illusion", ClassType.Assassin, SkillType.Sword,
1, 4, 1, 4,
40, -3, 40, -3,
12000, -1000, true, 40000, -3000, true,
new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD}, new Material[] {Material.IRON_SWORD, Material.GOLD_SWORD, Material.DIAMOND_SWORD},
new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK})); new Action[] {Action.RIGHT_CLICK_AIR, Action.RIGHT_CLICK_BLOCK}));

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

@ -64,7 +64,7 @@ public class Arcade extends JavaPlugin
{ {
//Delete Old Games Folders //Delete Old Games Folders
DeleteFolders(); DeleteFolders();
//Configs //Configs
getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/"); getConfig().addDefault(WEB_CONFIG, "http://accounts.mineplex.com/");
getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG)); getConfig().set(WEB_CONFIG, getConfig().getString(WEB_CONFIG));

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/kit/KitWitherMinion.java
View File

@ -54,10 +54,12 @@ public class KitWitherMinion extends Kit
// disguise.SetCustomNameVisible(true); // disguise.SetCustomNameVisible(true);
// Manager.GetDisguise().disguise(disguise); // Manager.GetDisguise().disguise(disguise);
// } // }
@Override @Override
public void GiveItems(Player player) public void GiveItems(Player player)
{ {
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1,
C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wither Skull")); C.cYellow + C.Bold + "Left-Click" + C.cWhite + C.Bold + " - " + C.cGreen + C.Bold + "Wither Skull"));