| Chunk |
|---|
| Conflicting content |
|---|
* @param message Message to be displayed
*/
public void sendMessage(String message);
<<<<<<< HEAD
/**
* Gets the socket address of this player
* @return the player's address
*/
public InetSocketAddress getAddress();
=======
/**
* Gets the "friendly" name to display of this player. This may include color.
*
* Note that this name will not be displayed in game, only in chat and places
* defined by plugins
*
* @return String containing a color formatted name to display for this player
*/
public String getDisplayName();
/**
* Sets the "friendly" name to display of this player. This may include color.
*
* Note that this name will not be displayed in game, only in chat and places
* defined by plugins
*
* @return String containing a color formatted name to display for this player
*/
public void setDisplayName(String name);
>>>>>>> b29d41c2826e2d355ef53e1a3f8e53a45393729d
} |
| Solution content |
|---|
* @param message Message to be displayed
*/
public void sendMessage(String message);
/**
* Gets the "friendly" name to display of this player. This may include color.
*
* Note that this name will not be displayed in game, only in chat and places
* defined by plugins
*
* @return String containing a color formatted name to display for this player
*/
public String getDisplayName();
/**
* Sets the "friendly" name to display of this player. This may include color.
*
* Note that this name will not be displayed in game, only in chat and places
* defined by plugins
*
* @return String containing a color formatted name to display for this player
*/
public void setDisplayName(String name);
/**
* Gets the socket address of this player
* @return the player's address
*/
public InetSocketAddress getAddress();
} |
| File |
|---|
| Player.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Comment |
| Method interface |