Merge remote-tracking branch 'origin/experimental' into experimental

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/GT_Server.java b/src/main/java/gregtech/common/GT_Server.java
index 4f9aa383ba..51bf9e898b 100644
--- a/src/main/java/gregtech/common/GT_Server.java
+++ b/src/main/java/gregtech/common/GT_Server.java
@@ -5,25 +5,31 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
 public class GT_Server extends GT_Proxy {
+    @Override
     public boolean isServerSide() {
         return true;
     }
 
+    @Override
     public boolean isClientSide() {
         return false;
     }
 
+    @Override
     public boolean isBukkitSide() {
         return false;
     }
 
+    @Override
     public void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ) {
     }
 
+    @Override
     public int addArmor(String aPrefix) {
         return 0;
     }
 
+    @Override
     public EntityPlayer getThePlayer() {
         return null;
     }