From aeb8f5c0cb4eeac808b110b49c9636266584f032 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Tue, 5 May 2015 10:52:18 +0200
Subject: [PATCH] Minor code refactoring

---
 .../eu/crushedpixel/replaymod/gui/GuiReplaySettings.java | 2 +-
 .../crushedpixel/replaymod/gui/online/GuiRegister.java   | 2 +-
 .../eu/crushedpixel/replaymod/replay/ReplaySender.java   | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySettings.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySettings.java
index 84f1184e..6b46643c 100755
--- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySettings.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiReplaySettings.java
@@ -145,7 +145,7 @@ public class GuiReplaySettings extends GuiScreen {
                 case RECORDSP_ID:
                     enabled = ReplayMod.replaySettings.isEnableRecordingSingleplayer();
                     enabled = !enabled;
-                    recordSPButton.displayString = I18n.format("replaymod.gui.settings.singleplayer")+": " + onOff(enabled);
+                    recordSPButton.displayString = I18n.format("replaymod.gui.settings.recordsingleplayer")+": " + onOff(enabled);
                     ReplayMod.replaySettings.setEnableRecordingSingleplayer(enabled);
                     break;
                 case SEND_CHAT:
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
index 89f49f34..1d4125a2 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiRegister.java
@@ -153,7 +153,7 @@ public class GuiRegister extends GuiScreen {
             if(usernameInput.getText().length() < 5) {
                 message = I18n.format("replaymod.gui.register.error.shortusername");
             } else if(!EmailAddressUtils.isValidEmailAddress(mailInput.getText())) {
-                message = I18n.format("replaymod.gui.register.error.invalidmail");
+                message = I18n.format("replaymod.api.invalidmail");
             } else if(!(passwordInput.getText().length() >= 5)) {
                 message = I18n.format("replaymod.gui.register.error.shortpw");
             } else if(!passwordConfirmation.getText().equals(passwordInput.getText())) {
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java
index 42e9dd07..3e2969db 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplaySender.java
@@ -76,6 +76,7 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
             joinPacketDimension, joinPacketDifficulty, joinPacketMaxPlayers;
     private Field effectPacketEntityId;
     private Field metadataPacketEntityId, metadataPacketList;
+    private Field objectTypeField;
     private Minecraft mc = Minecraft.getMinecraft();
     private int replayLength = 0;
     private int actualID = -1;
@@ -344,6 +345,14 @@ public class ReplaySender extends ChannelInboundHandlerAdapter {
             if(hurryToTimestamp && (!ReplayHandler.isInPath() || (desiredTimeStamp - currentTimeStamp > 1000))) {
                 if(p instanceof S45PacketTitle ||
                         p instanceof S2APacketParticles) return;
+
+                if(p instanceof S0EPacketSpawnObject) {
+                    S0EPacketSpawnObject pso = (S0EPacketSpawnObject)p;
+                    int type = pso.func_148993_l();
+                    if(type == 76) {
+                        return;
+                    }
+                }
             }
 
             if(p instanceof S29PacketSoundEffect && ReplayHandler.isInPath() && ReplayProcess.isVideoRecording()) {