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

Changed /home to /bed

Browse source 
Fixed bed teleportation still working when no bed is there
This commit is contained in:
LemADEC 2017-08-13 18:27:06 +02:00
parent 2581496e48
commit e3d4b6ad10
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -94,7 +94,7 @@ import cr0s.warpdrive.command.CommandDump;
import cr0s.warpdrive.command.CommandEntity;
import cr0s.warpdrive.command.CommandFind;
import cr0s.warpdrive.command.CommandGenerate;
import cr0s.warpdrive.command.CommandHome;
import cr0s.warpdrive.command.CommandBed;
import cr0s.warpdrive.command.CommandInvisible;
import cr0s.warpdrive.command.CommandJumpgates;
import cr0s.warpdrive.command.CommandReload;
@ -760,7 +760,7 @@ public class WarpDrive implements LoadingCallback {
event.registerServerCommand(new CommandEntity());
event.registerServerCommand(new CommandFind());
event.registerServerCommand(new CommandGenerate());
event.registerServerCommand(new CommandHome());
event.registerServerCommand(new CommandBed());
event.registerServerCommand(new CommandInvisible());
event.registerServerCommand(new CommandJumpgates());
event.registerServerCommand(new CommandReload());

47
src/main/java/cr0s/warpdrive/command/CommandHome.java → src/main/java/cr0s/warpdrive/command/CommandBed.java
View file

@ -2,12 +2,14 @@ package cr0s.warpdrive.command;
import cr0s.warpdrive.Commons;
import net.minecraft.block.Block;
import net.minecraft.block.BlockBed;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.ChunkCoordinates;
public class CommandHome extends CommandBase {
public class CommandBed extends CommandBase {
@Override
public int getRequiredPermissionLevel() {
@ -16,7 +18,7 @@ public class CommandHome extends CommandBase {
@Override
public String getCommandName() {
return "whome";
return "bed";
}
@Override
@ -63,26 +65,39 @@ public class CommandHome extends CommandBase {
assert (entityPlayerMPs != null);
for (final EntityPlayerMP entityPlayerMP : entityPlayerMPs) {
ChunkCoordinates bedLocation = entityPlayerMP.getBedLocation(entityPlayerMP.worldObj.provider.dimensionId);
if (bedLocation != null) {
entityPlayerMP.setPositionAndUpdate(bedLocation.posX + 0.5D, bedLocation.posY + 0.5D, bedLocation.posZ + 0.5D);
Commons.addChatMessage(entityPlayerMP, String.format("Teleporting to (%d %d %d)",
bedLocation.posX, bedLocation.posY, bedLocation.posZ));
final ChunkCoordinates bedLocation = entityPlayerMP.getBedLocation(entityPlayerMP.worldObj.provider.dimensionId);
if (bedLocation == null) {
Commons.addChatMessage(entityPlayerMP, String.format("§cTeleportation failed:\nyou need to set your bed location in %s",
entityPlayerMP.worldObj.provider.getDimensionName()));
if (params.length != 0) {
Commons.addChatMessage(commandSender, String.format("Teleporting player %s to DIM%d @ (%d %d %d)",
Commons.addChatMessage(commandSender, String.format("§cTeleportation failed for player %s:\nplayer needs to set his/her bed location in %s",
entityPlayerMP.getCommandSenderName(),
entityPlayerMP.worldObj.provider.dimensionId,
bedLocation.posX, bedLocation.posY, bedLocation.posZ));
entityPlayerMP.worldObj.provider.getDimensionName()));
}
} else {
Commons.addChatMessage(entityPlayerMP, String.format("&cTeleportation failed, no bed location in DIM%d",
entityPlayerMP.worldObj.provider.dimensionId));
continue;
}
final Block block = entityPlayerMP.worldObj.getBlock(bedLocation.posX, bedLocation.posY, bedLocation.posZ);
if (!(block instanceof BlockBed)) {
Commons.addChatMessage(entityPlayerMP, String.format("§cTeleportation failed:\nyour bed is no longer there in %s",
entityPlayerMP.worldObj.provider.getDimensionName()));
if (params.length != 0) {
Commons.addChatMessage(commandSender, String.format("&cTeleportation failed, no bed location for player %s in DIM%d",
Commons.addChatMessage(commandSender, String.format("§cTeleportation failed for player %s:\nbed is no longer there in %s",
entityPlayerMP.getCommandSenderName(),
entityPlayerMP.worldObj.provider.dimensionId));
entityPlayerMP.worldObj.provider.getDimensionName()));
}
continue;
}
entityPlayerMP.setPositionAndUpdate(bedLocation.posX + 0.5D, bedLocation.posY + 0.5D, bedLocation.posZ + 0.5D);
Commons.addChatMessage(entityPlayerMP, String.format("Teleporting to (%d %d %d)",
bedLocation.posX, bedLocation.posY, bedLocation.posZ));
if (params.length != 0) {
Commons.addChatMessage(commandSender, String.format("Teleporting player %s to %s @ (%d %d %d)",
entityPlayerMP.getCommandSenderName(),
entityPlayerMP.worldObj.provider.getDimensionName(),
bedLocation.posX, bedLocation.posY, bedLocation.posZ));
}
}
}