Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-10 06:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove mutability in clipboards (particularly clipboard pattern)

Browse Source 
fixes #776
This commit is contained in:
dordsor21
2020-12-11 11:34:56 +00:00
parent d4c0ab3790
commit be44e1449c
4 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
View File

@ -116,14 +116,8 @@ public class CPUOptimizedClipboard extends LinearClipboard {
return nbtMapIndex.get(index);
}
private int yLast;
private int yLastI;
private int zLast;
private int zLastI;
public int getIndex(int x, int y, int z) {
return x + ((yLast == y) ? yLastI : (yLastI = (yLast = y) * getArea())) + ((zLast == z) ? zLastI
: (zLastI = (zLast = z) * getWidth()));
return x + y * getArea() + z * getWidth();
}
@Override

3
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java
View File

@ -324,8 +324,7 @@ public class DiskOptimizedClipboard extends LinearClipboard implements Closeable
}
public int getIndex(int x, int y, int z) {
return x + (ylast == y ? ylasti : (ylasti = (ylast = y) * getArea())) + (zlast == z
? zlasti : (zlasti = (zlast = z) * getWidth()));
return x + y * getArea() + z * getWidth();
}
@Override

7
worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
View File

@ -193,13 +193,8 @@ public class MemoryOptimizedClipboard extends LinearClipboard {
return nbtMap.values();
}
private int ylast;
private int ylasti;
private int zlast;
private int zlasti;
public int getIndex(int x, int y, int z) {
return x + ((ylast == y) ? ylasti : (ylasti = (ylast = y) * getArea())) + ((zlast == z) ? zlasti : (zlasti = (zlast = z) * getWidth()));
return x + y * getArea() + z * getWidth();
}
@Override