DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup quick weather

Browse Source
This commit is contained in:
Jonas Herzig
2018-07-27 21:26:18 +02:00
parent 12605f51de
commit 42a2ae35ed
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -10,6 +10,7 @@ import com.github.steveice10.mc.protocol.data.game.setting.Difficulty;
import com.github.steveice10.mc.protocol.data.game.world.WorldType; import com.github.steveice10.mc.protocol.data.game.world.WorldType;
import com.github.steveice10.mc.protocol.data.game.world.block.BlockChangeRecord; import com.github.steveice10.mc.protocol.data.game.world.block.BlockChangeRecord;
import com.github.steveice10.mc.protocol.data.game.world.block.BlockState; import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
import com.github.steveice10.mc.protocol.data.game.world.notify.ClientNotification;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPlayerListEntryPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.ServerPlayerListEntryPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.ServerRespawnPacket;
import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityDestroyPacket; import com.github.steveice10.mc.protocol.packet.ingame.server.entity.ServerEntityDestroyPacket;
@@ -355,17 +356,15 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
switch (p.getNotification()) { switch (p.getNotification()) {
case START_RAIN: case START_RAIN:
if (activeWeather != null) { if (activeWeather != null) {
activeWeather.despawnPackets = Collections.singletonList(toMC(packet));
activeWeather.despawnTime = time; activeWeather.despawnTime = time;
thingDespawns.put(time, activeWeather); thingDespawns.put(time, activeWeather);
} }
activeWeather = new Weather(toMC(packet)); activeWeather = new Weather();
activeWeather.spawnTime = time; activeWeather.spawnTime = time;
thingSpawns.put(time, activeWeather); thingSpawns.put(time, activeWeather);
break; break;
case STOP_RAIN: case STOP_RAIN:
if (activeWeather != null) { if (activeWeather != null) {
activeWeather.despawnPackets = Collections.singletonList(toMC(packet));
activeWeather.despawnTime = time; activeWeather.despawnTime = time;
thingDespawns.put(time, activeWeather); thingDespawns.put(time, activeWeather);
activeWeather = null; activeWeather = null;
@@ -577,8 +576,9 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
private static class Weather extends TrackedThing { private static class Weather extends TrackedThing {
private TreeMap<Integer, Packet<?>> rainStrengths = new TreeMap<>(); private TreeMap<Integer, Packet<?>> rainStrengths = new TreeMap<>();
private Weather(Packet<?> spawnPacket) { private Weather() {
this.spawnPackets = Collections.singletonList(spawnPacket); this.spawnPackets = Collections.singletonList(toMC(new ServerNotifyClientPacket(ClientNotification.START_RAIN, null)));
this.despawnPackets = Collections.singletonList(toMC(new ServerNotifyClientPacket(ClientNotification.STOP_RAIN, null)));
} }
@Override @Override