1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-06 06:37:28 +02:00

Update Bukkit to 1.7.3-R0.3 - Bukkit: 1903 CB: 3020

This also disables vanilla fallback, use new aliases file.
This commit is contained in:
KHobbits
2014-02-19 00:36:21 +00:00
parent 9041abe31f
commit b12726e1c3
3 changed files with 14 additions and 20 deletions

View File

@@ -101,7 +101,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
private transient Metrics metrics; private transient Metrics metrics;
private transient EssentialsTimer timer; private transient EssentialsTimer timer;
private transient List<String> vanishedPlayers = new ArrayList<String>(); private transient List<String> vanishedPlayers = new ArrayList<String>();
private transient SimpleCommandMap scm;
public Essentials() public Essentials()
{ {
@@ -153,7 +152,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
i18n = new I18n(this); i18n = new I18n(this);
i18n.onEnable(); i18n.onEnable();
execTimer.mark("I18n1"); execTimer.mark("I18n1");
scm = new SimpleCommandMap(this.getServer());
final PluginManager pm = getServer().getPluginManager(); final PluginManager pm = getServer().getPluginManager();
for (Plugin plugin : pm.getPlugins()) for (Plugin plugin : pm.getPlugins())
{ {
@@ -457,16 +455,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
// Check for disabled commands // Check for disabled commands
if (getSettings().isCommandDisabled(commandLabel)) if (getSettings().isCommandDisabled(commandLabel))
{ {
if (scm != null)
{
for (VanillaCommand cmd : scm.getFallbackCommands())
{
if (cmd.matches(commandLabel))
{
cmd.execute(cSender, commandLabel, args);
}
}
}
return true; return true;
} }

View File

@@ -1365,48 +1365,54 @@ public class OfflinePlayer implements Player
@Override @Override
public void playSound(Location arg0, String arg1, float arg2, float arg3) public void playSound(Location arg0, String arg1, float arg2, float arg3)
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public boolean isHealthScaled() public boolean isHealthScaled()
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public void setHealthScaled(boolean arg0) public void setHealthScaled(boolean arg0)
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public void setHealthScale(double arg0) throws IllegalArgumentException public void setHealthScale(double arg0) throws IllegalArgumentException
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public double getHealthScale() public double getHealthScale()
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public boolean isLeashed() public boolean isLeashed()
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public Entity getLeashHolder() throws IllegalStateException public Entity getLeashHolder() throws IllegalStateException
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
} }
@Override @Override
public boolean setLeashHolder(Entity arg0) public boolean setLeashHolder(Entity arg0)
{ {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public <T extends Projectile> T launchProjectile(Class<? extends T> type, Vector vector)
{
throw new UnsupportedOperationException("Not supported yet.");
} }
} }

Binary file not shown.