Fixes #136

Fixing #58 again ._.

Author: Scribble

src/main/java/de/scribble/lp/tasmod/mixin/accessors/AccessorWorldServer.java

@@ -0,0 +1,15 @@
+package de.scribble.lp.tasmod.mixin.accessors;
+
+import java.util.Set;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.world.NextTickListEntry;
+import net.minecraft.world.WorldServer;
+
+@Mixin(WorldServer.class)
+public interface AccessorWorldServer {
+	@Accessor("pendingTickListEntriesHashSet")
+	public Set<NextTickListEntry> getTickListEntries();
+}

src/main/java/de/scribble/lp/tasmod/savestates/server/SavestateHandler.java

@@ -313,6 +313,14 @@ public void loadState(int savestateIndex, boolean tickrate0, boolean changeIndex
 		// Send a notification that the savestate has been loaded
 		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + indexToLoad + " loaded"));
 
+		// Add players to the chunk
+		server.getPlayerList().getPlayers().forEach(player->{
+			SavestatesChunkControl.addPlayerToServerChunk(player);
+		});
+		
+		// Updating redstone component timers to the new world time (#136)
+		SavestatesChunkControl.updateWorldServerTickListEntries();
+		
 		WorldServer[] worlds = DimensionManager.getWorlds();
 
 		for (WorldServer world : worlds) {
@@ -548,6 +556,6 @@ public static void playerLoadSavestateEventServer() {
 
 	@SideOnly(Side.CLIENT)
 	public static void playerLoadSavestateEventClient() {
-		SavestatesChunkControl.addPlayerToChunk(Minecraft.getMinecraft().player);
+		SavestatesChunkControl.addPlayerToClientChunk(Minecraft.getMinecraft().player);
 	}
 }

src/main/java/de/scribble/lp/tasmod/savestates/server/chunkloading/SavestatesChunkControl.java

@@ -2,9 +2,11 @@
 
 import java.util.List;
 
+import de.scribble.lp.tasmod.TASmod;
 import de.scribble.lp.tasmod.duck.ChunkProviderDuck;
 import de.scribble.lp.tasmod.mixin.accessors.AccessorSaveHandler;
 import de.scribble.lp.tasmod.mixin.accessors.AccessorWorld;
+import de.scribble.lp.tasmod.mixin.accessors.AccessorWorldServer;
 import de.scribble.lp.tasmod.mixin.savestates.MixinChunkProviderClient;
 import de.scribble.lp.tasmod.mixin.savestates.MixinChunkProviderServer;
 import net.minecraft.client.Minecraft;
@@ -13,6 +15,7 @@
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.NextTickListEntry;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.ChunkProviderServer;
@@ -177,26 +180,59 @@ public static void keepPlayerInLoadedEntityList(net.minecraft.entity.player.Enti
 	 * <br>
 	 * Even after adding the player to the world, the chunks may not load the player correctly. <br>
 	 * <br>
-	 * Without this, no model is shown in third person and the player is able to place blocks inside of him.<br>
+	 * Without this, no model is shown in third person<br>
 	 * This state is fixed, once the player moves into a different chunk, since the new chunk adds the player to it's list. <br>
 	 * <br>
 	 * 
 	 * TLDR:<br>
-	 * Adds the player to the chunk so he can't place any blocks inside himself <br>
+	 * Adds the player to the chunk so the player is shown in third person <br>
 	 * <br>
 	 * Side: Client
 	 */
 	@SideOnly(Side.CLIENT)
-	public static void addPlayerToChunk(net.minecraft.entity.player.EntityPlayer player) {
+	public static void addPlayerToClientChunk(net.minecraft.entity.player.EntityPlayer player) {
 		int i = MathHelper.floor(player.posX / 16.0D);
-        int j = MathHelper.floor(player.posZ / 16.0D);
-        Chunk chunk=Minecraft.getMinecraft().world.getChunkFromChunkCoords(i, j);
-        for (int k = 0; k < chunk.getEntityLists().length; k++) {
-        	if(chunk.getEntityLists()[k].contains(player)) {
-        		return;
-        	}
+		int j = MathHelper.floor(player.posZ / 16.0D);
+		Chunk chunk = Minecraft.getMinecraft().world.getChunkFromChunkCoords(i, j);
+		for (int k = 0; k < chunk.getEntityLists().length; k++) {
+			if (chunk.getEntityLists()[k].contains(player)) {
+				return;
+			}
 		}
-        chunk.addEntity(player);
+		chunk.addEntity(player);
 	}
 
+	/**
+	 * Just like {@link #addPlayerToClientChunk(EntityPlayer)}, adds the player to the chunk on the server.
+	 * This prevents the player from being able to place block inside of him
+	 * 
+	 * Side: Server
+	 */
+	public static void addPlayerToServerChunk(net.minecraft.entity.player.EntityPlayerMP player) {
+		int i = MathHelper.floor(player.posX / 16.0D);
+		int j = MathHelper.floor(player.posZ / 16.0D);
+		WorldServer world = player.getServerWorld();
+		Chunk chunk = world.getChunkFromChunkCoords(i, j);
+		for (int k = 0; k < chunk.getEntityLists().length; k++) {
+			if (chunk.getEntityLists()[k].contains(player)) {
+				return;
+			}
+		}
+		chunk.addEntity(player);
+	}
+	
+	/**
+	 * Updates ticklist entries to the current world time, allowing them to not be stuck in a pressed state #136
+	 */
+	public static void updateWorldServerTickListEntries() {
+		MinecraftServer server=TASmod.getServerInstance();
+		for (WorldServer world : server.worlds) {
+			AccessorWorldServer acworld=(AccessorWorldServer) world;
+			
+            for (NextTickListEntry nextticklistentry : acworld.getTickListEntries())
+            {
+            	nextticklistentry.setScheduledTime(world.getTotalWorldTime());
+            }
+		}
+	}
 }

src/main/resources/mixins.tasmod.json

@@ -26,8 +26,8 @@
         "accessors.AccessorEntity",
         "accessors.AccessorMinecraftServer",
         "accessors.AccessorSaveHandler",
-        "accessors.AccessorWorld"
-        
+        "accessors.AccessorWorld",
+        "accessors.AccessorWorldServer"
 
     ],
     "client": [