Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-01-09 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to disable ticking existing blocks when not fastmode

Browse Source
This commit is contained in:
dordsor21 2020-05-11 16:09:31 +01:00
parent 0b30ca9dcc
commit be58cd42ac
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/NMSAdapter.java
View File

@ -29,7 +29,7 @@ public class NMSAdapter {
air++; air++;
break; break;
default: default:
if (!tick_placed && !tick_placed) { if (!fastmode && !tick_placed) {
boolean ticking; boolean ticking;
if (ordinal != lastOrdinal) { if (ordinal != lastOrdinal) {
ticking = BlockTypesCache.ticking[ordinal]; ticking = BlockTypesCache.ticking[ordinal];
@ -68,6 +68,7 @@ public class NMSAdapter {
char lastOrdinal = BlockID.__RESERVED__; char lastOrdinal = BlockID.__RESERVED__;
boolean lastticking = false; boolean lastticking = false;
boolean tick_placed = Settings.IMP.EXPERIMENTAL.ALLOW_TICK_PLACED; boolean tick_placed = Settings.IMP.EXPERIMENTAL.ALLOW_TICK_PLACED;
boolean tick_existing = Settings.IMP.EXPERIMENTAL.ALLOW_TICK_EXISTING;
for (int i = 0; i < 4096; i++) { for (int i = 0; i < 4096; i++) {
char ordinal = set[i]; char ordinal = set[i];
switch (ordinal) { switch (ordinal) {
@ -85,7 +86,7 @@ public class NMSAdapter {
air++; air++;
break; break;
default: default:
if (!fastmode && !tick_placed) { if (!fastmode && !tick_placed && tick_existing) {
boolean ticking; boolean ticking;
if (ordinal != lastOrdinal) { if (ordinal != lastOrdinal) {
ticking = BlockTypesCache.ticking[ordinal]; ticking = BlockTypesCache.ticking[ordinal];

6
worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -380,6 +380,12 @@ public class Settings extends Config {
"This has no effect on existing blocks one way or the other." "This has no effect on existing blocks one way or the other."
}) })
public boolean ALLOW_TICK_PLACED = false; public boolean ALLOW_TICK_PLACED = false;
@Comment({
"Force re-ticking of existing blocks not edited by FAWE.",
"This will increase time taken slightly."
})
public boolean ALLOW_TICK_EXISTING = true;
} }
public static class WEB { public static class WEB {