| Chunk |
|---|
| Conflicting content |
|---|
Player bukkit = convert(player); if (bukkit == null) return null; <<<<<<< HEAD return ((CraftPlayer) bukkit).getHandle(); ======= CraftPlayer craftPlayer = (CraftPlayer) player.getRaw(); if (craftPlayer == null) return null; return craftPlayer.getHandle(); >>>>>>> fb8ffb9d2e5e7064c8607ba2808b22c70469da41 } @Nullable |
| Solution content |
|---|
Player bukkit = convert(player); if (bukkit == null) return null; return ((CraftPlayer) bukkit).getHandle(); } @Nullable |
| File |
|---|
| ObjectUnwrapper.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Cast expression |
| If statement |
| Method invocation |
| Return statement |
| Variable |