13
0
geforkt von Mirrors/Paper

Finish mixin diff review

The mixin diff review looks OK, but need to check the
patch diff now.
Dieser Commit ist enthalten in:
Spottedleaf 2024-10-24 12:47:34 -07:00
Ursprung f35b3d7460
Commit 93271dfe39
2 geänderte Dateien mit 11 neuen und 8 gelöschten Zeilen

Datei anzeigen

@ -1,7 +1,4 @@
reference comparison:
https://github.com/Tuinity/Moonrise/compare/6a2c6d27df11d417c1fefa749109d8e87599e8c2...f22335f0b65e205831c74a7b4b8f4d93fff54fd5
todo: todo:
- need to compare the diffs - need to compare the patch diff for moonrise
- in ChunkEntitySlices, implement modifySavedEntities() by copying from old - in ChunkEntitySlices, implement modifySavedEntities() by copying from old
- port poi_lookup?

Datei anzeigen

@ -23878,6 +23878,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
public boolean blockChanged(BlockPos pos) {
- LevelChunk chunk = this.getTickingChunk();
+ LevelChunk chunk = this.playersSentChunkTo.size() == 0 ? null : this.getChunkToSend(); // Paper - rewrite chunk system
if (chunk == null) {
return false;
@@ -0,0 +0,0 @@ public class ChunkHolder extends GenerationChunkHolder { @@ -0,0 +0,0 @@ public class ChunkHolder extends GenerationChunkHolder {
return false; return false;
} else { } else {
@ -31032,7 +31038,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
}; };
protected final O owner; protected final O owner;
- private final Reference2ObjectArrayMap<Property<?>, Comparable<?>> values; - private final Reference2ObjectArrayMap<Property<?>, Comparable<?>> values;
+ private Reference2ObjectArrayMap<Property<?>, Comparable<?>> values; // Paper - optimise blockstate property access - remove final + private Reference2ObjectArrayMap<Property<?>, Comparable<?>> values; // Paper - optimise blockstate property access - remove final
private Map<Property<?>, S[]> neighbours; private Map<Property<?>, S[]> neighbours;
protected final MapCodec<S> propertiesCodec; protected final MapCodec<S> propertiesCodec;
@ -31889,8 +31895,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final ca.spottedleaf.moonrise.common.list.ShortList tickingBlocks = new ca.spottedleaf.moonrise.common.list.ShortList(); + private final ca.spottedleaf.moonrise.common.list.ShortList tickingBlocks = new ca.spottedleaf.moonrise.common.list.ShortList();
+ +
+ @Override + @Override
+ public final int moonrise$getSpecialCollidingBlocks() { + public final boolean moonrise$hasSpecialCollidingBlocks() {
+ return this.specialCollidingBlocks; + return this.specialCollidingBlocks != 0;
+ } + }
+ +
+ @Override + @Override