minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-22 22:34:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'refs/heads/master' into 3.0

Browse Source 
Did some tweaks, so that it actually works.

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/User.java
	Essentials/src/com/earth2me/essentials/Util.java
	Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
	Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
	Essentials/src/com/earth2me/essentials/commands/Commandmail.java
	Essentials/src/com/earth2me/essentials/commands/Commandme.java
	Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
	Essentials/src/com/earth2me/essentials/commands/Commandnick.java
	Essentials/src/com/earth2me/essentials/commands/Commandr.java
	Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
	EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
	EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
	build.xml
This commit is contained in:
snowleo
2012-01-18 04:01:01 +01:00
parent 27b0cc86de 5c1d49fd0e
commit f0dd81ee00
144 changed files with 1680 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandsetxmpp.java
View File

@@ -8,7 +8,7 @@ import com.earth2me.essentials.commands.NotEnoughArgumentsException;
public class Commandsetxmpp extends EssentialsCommand
{
@Override
protected void run(final IUser user, final String[] args) throws NotEnoughArgumentsException
protected void run(final IUser user, final String commandLabel, final String[] args) throws NotEnoughArgumentsException
{
if (args.length < 1)
{

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java
View File

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
public class Commandxmpp extends EssentialsCommand
{
@Override
protected void run(final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws NotEnoughArgumentsException
{
if (args.length < 2)
{

2
EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmppspy.java
View File

@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
public class Commandxmppspy extends EssentialsCommand
{
@Override
protected void run(final CommandSender sender, final String[] args) throws NotEnoughArgumentsException
protected void run(final CommandSender sender, final String commandLabel, final String[] args) throws NotEnoughArgumentsException
{
if (args.length < 1)
{