Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some merge issues.

Browse source
This commit is contained in:
CannibalVox 2013-12-06 21:14:20 -06:00
parent 2388be2681
commit 7dc51a8e56
3 changed files with 9 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
StevenDimDoors/mod_pocketDim/ConnectionHandler.java
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)
{
}
}

8
StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
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);
}
}

1
StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
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;