소스 검색

Cleaning up minor issue with the ChunkStore.

Glitchfinder 12 년 전
부모
커밋
0fae8be816
1개의 변경된 파일6개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 7
      src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java

+ 6 - 7
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java

@@ -178,16 +178,15 @@ public class PrimitiveChunkStore implements ChunkStore {
     }
 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-        int fileVersionNumber; // Can be used to determine the format of the file
-
-        long lsb = in.readLong();
-        if (((int) (lsb >> 32)) == MAGIC_NUMBER) {
-            fileVersionNumber = (int) lsb;
-            lsb = in.readLong();
-        } else {
+        int magic = in.readInt();
+        // Can be used to determine the format of the file
+        int fileVersionNumber = in.readInt();
+        
+        if (magic != MAGIC_NUMBER) {
             fileVersionNumber = 0;
         }
 
+        long lsb = in.readLong();
         long msb = in.readLong();
         worldUid = new UUID(msb, lsb);
         cx = in.readInt();