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

Fix recording of certain mobs on Hypixel

Browse Source 
For some reason hypixel is sending duplicate entity meta data entries
in their spawn packets.
We'll now be ignoring all but the last one for each id (should match
how vanilla handles these).
This commit is contained in:
Jonas Herzig
2019-06-30 13:14:47 +02:00
parent 7241036e61
commit b2b0ca1cd1
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/replaymod/recording/packet/PacketListener.java
View File

@@ -1,5 +1,6 @@
package com.replaymod.recording.packet; package com.replaymod.recording.packet;
import com.google.common.collect.Lists;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.replaymod.core.ReplayMod; import com.replaymod.core.ReplayMod;
import com.replaymod.core.utils.Restrictions; import com.replaymod.core.utils.Restrictions;
@@ -317,12 +318,15 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
if (pa.getDataManager() == null) { if (pa.getDataManager() == null) {
pa.setDataManager(new DataTracker(null)); pa.setDataManager(new DataTracker(null));
if (p.getTrackedValues() != null) { if (p.getTrackedValues() != null) {
Set<Integer> seen = new HashSet<>();
//#if MC>=10904 //#if MC>=10904
for (DataTracker.Entry<?> entry : p.getTrackedValues()) { for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
if (!seen.add(entry.getData().getId())) continue;
DataManager_set(pa.getDataManager(), entry); DataManager_set(pa.getDataManager(), entry);
} }
//#else //#else
//$$ for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_149027_c()) { //$$ for(DataWatcher.WatchableObject wo : Lists.reverse((List<DataWatcher.WatchableObject>) p.func_149027_c())) {
//$$ if (!seen.add(wo.getDataValueId())) continue;
//$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject()); //$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject());
//$$ } //$$ }
//#endif //#endif
@@ -336,12 +340,15 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
if (pa.getDataManager() == null) { if (pa.getDataManager() == null) {
pa.setDataManager(new DataTracker(null)); pa.setDataManager(new DataTracker(null));
if (p.getTrackedValues() != null) { if (p.getTrackedValues() != null) {
Set<Integer> seen = new HashSet<>();
//#if MC>=10904 //#if MC>=10904
for (DataTracker.Entry<?> entry : p.getTrackedValues()) { for (DataTracker.Entry<?> entry : Lists.reverse(p.getTrackedValues())) {
if (!seen.add(entry.getData().getId())) continue;
DataManager_set(pa.getDataManager(), entry); DataManager_set(pa.getDataManager(), entry);
} }
//#else //#else
//$$ for(DataWatcher.WatchableObject wo : (List<DataWatcher.WatchableObject>) p.func_148944_c()) { //$$ for(DataWatcher.WatchableObject wo : Lists.reverse((List<DataWatcher.WatchableObject>) p.func_148944_c())) {
//$$ if (!seen.add(wo.getDataValueId())) continue;
//$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject()); //$$ pa.getDataManager().addObject(wo.getDataValueId(), wo.getObject());
//$$ } //$$ }
//#endif //#endif