Merging Canvox's patch #106

Merged
StevenRS11 merged 14 commits from master into 1.6.2-code 2013-12-17 02:10:44 +00:00
3 changed files with 9 additions and 34 deletions
Showing only changes of commit 7dc51a8e56 - Show all commits

View File

@@ -41,28 +41,6 @@ public class ConnectionHandler implements IConnectionHandler
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
{
}
@Override
public void connectionOpened(NetHandler netClientHandler,MinecraftServer server, INetworkManager manager)
{
}
@Override
public void connectionClosed(INetworkManager manager)
{
if(PocketManager.isConnected)
{
PocketManager.unload();
}
return null;
}
@Override
public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { }
@@ -87,16 +65,4 @@ public class ConnectionHandler implements IConnectionHandler
//Send information about all the registered dimensions and links to the client
}
@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
{
return;
}
@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
{
}
}

View File

@@ -72,4 +72,12 @@ public abstract class DDCommandBase extends CommandBase
sendChat(player,(result.getMessage()));
}
}
public static void sendChat(EntityPlayer player, String message)
{
ChatMessageComponent cmp = new ChatMessageComponent();
cmp.addText(message);
player.sendChatToPlayer(cmp);
}
}

View File

@@ -6,6 +6,7 @@ import net.minecraft.entity.DataWatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityFlying;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;