minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

Fixing Warp, Spawnmob signs

Browse Source 
Fix Imports
This commit is contained in:
KHobbits
2012-01-04 21:41:05 +00:00
parent 8432e1fc7d
commit 3513d72a7b
17 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View File

@@ -2,11 +2,10 @@ package com.earth2me.essentials.chat;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.ISettings;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.settings.GroupOptions;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Logger;

1
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
View File

@@ -2,7 +2,6 @@ package com.earth2me.essentials.chat;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.chat.EssentialsLocalChatEvent;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;

4
EssentialsSigns/src/com/earth2me/essentials/signs/EssentialsSign.java
View File

@@ -1,7 +1,9 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.HashSet;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;

6
EssentialsSigns/src/com/earth2me/essentials/signs/SignEnchant.java
View File

@@ -2,13 +2,11 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.Enchantments;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.Locale;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignFree.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.craftbukkit.ShowInventory;
import org.bukkit.Material;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignGameMode.java
View File

@@ -2,8 +2,8 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.Locale;
import org.bukkit.GameMode;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignHeal.java
View File

@@ -2,8 +2,8 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;

5
EssentialsSigns/src/com/earth2me/essentials/signs/SignKit.java
View File

@@ -1,12 +1,11 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.*;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.settings.Kit;
import java.util.List;
import java.util.Locale;
import java.util.Map;
public class SignKit extends EssentialsSign

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignProtection.java
View File

@@ -2,10 +2,10 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import java.util.*;
import org.bukkit.Location;
import org.bukkit.Material;

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignSell.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;

10
EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.commands.Commandspawnmob;
@@ -22,20 +22,22 @@ public class SignSpawnmob extends EssentialsSign
return true;
}
//TODO: This should call a method not a command
@Override
protected boolean onSignInteract(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException
{
final Trade charge = getTrade(sign, 3, ess);
charge.isAffordableFor(player);
Commandspawnmob command = new Commandspawnmob();
command.setEssentials(ess);
Commandspawnmob command = new Commandspawnmob();
command.init(ess, "spawnmob");
String[] args = new String[]
{
sign.getLine(2), sign.getLine(1)
};
try
{
command.run(ess.getServer(), player, "spawnmob", args);
command.run(player, args);
}
catch (Exception ex)
{

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignTime.java
View File

@@ -2,8 +2,8 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;

4
EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java
View File

@@ -1,7 +1,9 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.*;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.Util;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import org.bukkit.inventory.ItemStack;

9
EssentialsSigns/src/com/earth2me/essentials/signs/SignWarp.java
View File

@@ -1,8 +1,8 @@
package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -49,10 +49,9 @@ public class SignWarp extends EssentialsSign
{
final String warpName = sign.getLine(1);
final String group = sign.getLine(2);
if ((!group.isEmpty()
&& ("§2Everyone".equals(group)
|| player.inGroup(group)))
|| (group.isEmpty() && (!ess.getSettings().getPerWarpPermission() || player.isAuthorized("essentials.warp." + warpName))))
if ((!group.isEmpty() && ("§2Everyone".equals(group) || player.inGroup(group)))
|| (group.isEmpty() && player.isAuthorized("essentials.warp." + warpName)))
{
final Trade charge = getTrade(sign, 3, ess);
try

2
EssentialsSigns/src/com/earth2me/essentials/signs/SignWeather.java
View File

@@ -2,8 +2,8 @@ package com.earth2me.essentials.signs;
import com.earth2me.essentials.ChargeException;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
View File

@@ -4,8 +4,6 @@ import com.earth2me.essentials.EssentialsCommandHandler;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.ICommandHandler;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IEssentialsModule;
import com.earth2me.essentials.api.ISettings;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.Bukkit;