Make EnderChest available for offline players
@@ -305,6 +305,7 @@ default GameModeData getGameModeData() {
void setSleepingIgnored(boolean sleepingIgnored);
/**
+<<<<<<< HEAD
* Gets the {@link Inventory} available for this Player's shared {@link EnderChest}
* contents.
*
@@ -314,6 +315,8 @@ default GameModeData getGameModeData() {
Inventory getEnderChestInventory();
/**
+=======
+>>>>>>> ff01f0ce... make EnderChest available for offline players
* Manually respawns the player.
*
* <p>If the player is not dead, this method will return <tt>false</tt></p>
