Projects >> Framework >>6085f6405a7a6cf8bc27f1d6a0a038e2d9d71eb6

Chunk
Conflicting content 
		player.teleport(new Location(world.getRaw(), x, y, z));
	}

<<<<<<< HEAD
    public RunsafeLocation getLocation()
    {
        return new RunsafeLocation(player.getLocation());
    }

    public void sendMessage(String message)
    {
        player.sendMessage(message);
    }
=======
	public void sendMessage(String message)
	{
		player.sendMessage(message);
	}
>>>>>>> 6c910875fe4c96485ab84a604feb9d630fce84b7

	public RunsafeWorld getWorld()
	{
Solution content 
		player.teleport(new Location(world.getRaw(), x, y, z));
	}

    public RunsafeLocation getLocation()
    {
        return new RunsafeLocation(player.getLocation());
    }

    public void sendMessage(String message)
    {
        player.sendMessage(message);
    }

	public RunsafeWorld getWorld()
	{
File
RunsafePlayer.java
Developer's decision
Version 1
Kind of conflict
Method declaration