| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void onPlayerMove(PlayerMoveEvent event) {
<<<<<<< HEAD
if(event.isCancelled()) {
return;
}
=======
>>>>>>> da379ca336e82dfef6a8eed9af43f991356caaf8
ContribCraftPlayer player = (ContribCraftPlayer)event.getPlayer();
ContribNetServerHandler netServerHandler = player.getNetServerHandler();
|
| Solution content |
|---|
@Override
public void onPlayerMove(PlayerMoveEvent event) {
if(event.isCancelled()) {
return;
}
ContribCraftPlayer player = (ContribCraftPlayer)event.getPlayer();
ContribNetServerHandler netServerHandler = player.getNetServerHandler();
|
| File |
|---|
| ContribPlayerListener.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |