Update SpongeCommon for chunk unload fix.

OwnageTechGeek · Sep 6, 2016 · c9fdd43 · c9fdd43
1 parent a4e322a
commit c9fdd43
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 54 deletions.
diff --git a/SpongeCommon b/SpongeCommon
diff --git a/src/main/java/org/spongepowered/mod/entity/PlayerChunkRunnable.java b/src/main/java/org/spongepowered/mod/entity/PlayerChunkRunnable.java
@@ -27,7 +27,6 @@
 import net.minecraft.server.management.PlayerChunkMap;
 import net.minecraft.server.management.PlayerChunkMapEntry;
 import net.minecraft.world.chunk.Chunk;
-import org.spongepowered.common.interfaces.world.gen.IMixinChunkProviderServer;
 import org.spongepowered.mod.interfaces.IMixinPlayerChunkMapEntry;
 
 public class PlayerChunkRunnable implements Runnable {
@@ -44,7 +43,7 @@ public PlayerChunkRunnable(PlayerChunkMap playerChunkMap, PlayerChunkMapEntry pl
     @Override
     public void run() {
         IMixinPlayerChunkMapEntry spongePlayerChunkMapEntry = (IMixinPlayerChunkMapEntry) this.playerChunkMapEntry;
-        Chunk chunk = ((IMixinChunkProviderServer) this.playerChunkMap.getWorldServer().getChunkProvider()).getChunkIfLoaded(this.playerChunkMapEntry.pos.chunkXPos, this.playerChunkMapEntry.pos.chunkZPos);
+        Chunk chunk = this.playerChunkMap.getWorldServer().getChunkProvider().getLoadedChunk(this.playerChunkMapEntry.pos.chunkXPos, this.playerChunkMapEntry.pos.chunkZPos);
         if (chunk != null) {
             spongePlayerChunkMapEntry.setChunk(chunk);
             return;

diff --git a/...in/java/org/spongepowered/mod/mixin/core/client/multiplayer/MixinChunkProviderClient.java b/...in/java/org/spongepowered/mod/mixin/core/client/multiplayer/MixinChunkProviderClient.java
diff --git a/src/main/java/org/spongepowered/mod/mixin/core/world/MixinChunk.java b/src/main/java/org/spongepowered/mod/mixin/core/world/MixinChunk.java
@@ -40,7 +40,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.interfaces.IMixinChunk;
-import org.spongepowered.common.interfaces.world.gen.IMixinChunkProviderServer;
 
 @NonnullByDefault
 @Mixin(net.minecraft.world.chunk.Chunk.class)
@@ -74,7 +73,7 @@ public void onSetChunkLoaded(boolean loaded, CallbackInfo ci) {
         Direction[] directions = {Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST};
         for (Direction direction : directions) {
             Vector3i neighborPosition = this.getPosition().add(direction.asBlockOffset());
-            net.minecraft.world.chunk.Chunk neighbor = ((IMixinChunkProviderServer) this.worldObj.getChunkProvider()).getChunkIfLoaded
+            net.minecraft.world.chunk.Chunk neighbor = this.worldObj.getChunkProvider().getLoadedChunk
                     (neighborPosition.getX(), neighborPosition.getZ());
             if (neighbor != null) {
                 this.setNeighbor(direction, (Chunk) neighbor);

diff --git a/src/main/resources/mixins.forge.core.json b/src/main/resources/mixins.forge.core.json
@@ -99,7 +99,6 @@
     "client": [
         "client.MixinMinecraft",
         "client.gui.MixinGuiOverlayDebug",
-        "client.multiplayer.MixinChunkProviderClient",
         "client.network.MixinNetHandlerPlayClient",
         "client.server.MixinIntegratedServer",
         "server.MixinIntegratedServerAnonInner3"