Post merge checkstyle fixes.

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

src/main/java/org/spongepowered/api/data/DataTransactionResult.java

@@ -375,15 +375,15 @@ public boolean equals(Object o) {
             return false;
         }
         DataTransactionResult that = (DataTransactionResult) o;
-        return type == that.type &&
-               Objects.equal(rejected, that.rejected) &&
-               Objects.equal(replaced, that.replaced) &&
-               Objects.equal(success, that.success);
+        return this.type == that.type
+               && Objects.equal(this.rejected, that.rejected)
+               && Objects.equal(this.replaced, that.replaced)
+               && Objects.equal(this.success, that.success);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(type, rejected, replaced, success);
+        return Objects.hashCode(this.type, this.rejected, this.replaced, this.success);
     }
 
     /**

src/main/java/org/spongepowered/api/entity/living/player/Player.java

@@ -28,9 +28,6 @@
 import org.spongepowered.api.block.tileentity.EnderChest;
 import org.spongepowered.api.command.CommandManager;
 import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.event.message.MessageChannelEvent;
-import org.spongepowered.api.text.channel.MessageReceiver;
-import org.spongepowered.api.text.chat.ChatType;
 import org.spongepowered.api.command.source.RemoteSource;
 import org.spongepowered.api.data.key.Keys;
 import org.spongepowered.api.data.manipulator.mutable.DisplayNameData;
@@ -45,6 +42,7 @@
 import org.spongepowered.api.entity.living.player.gamemode.GameModes;
 import org.spongepowered.api.entity.living.player.tab.TabList;
 import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.message.MessageChannelEvent;
 import org.spongepowered.api.item.inventory.Container;
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.network.PlayerConnection;
@@ -53,6 +51,8 @@
 import org.spongepowered.api.scoreboard.Scoreboard;
 import org.spongepowered.api.text.Text;
 import org.spongepowered.api.text.channel.ChatTypeMessageReceiver;
+import org.spongepowered.api.text.channel.MessageReceiver;
+import org.spongepowered.api.text.chat.ChatType;
 import org.spongepowered.api.text.chat.ChatVisibility;
 
 import java.time.Instant;