mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-24 22:26:45 +01:00
fix: attempt to recover from IllegalStateException when restoring block tags
- Fixes #3801
This commit is contained in:
parent
49b19e0eaf
commit
e1f53033bc
@ -44,6 +44,7 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
|
||||
private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + LimitedRegionWrapperQueue.class.getSimpleName());
|
||||
|
||||
private final LimitedRegion limitedRegion;
|
||||
private boolean useOtherRestoreTagMethod = false;
|
||||
|
||||
/**
|
||||
* @since 6.9.0
|
||||
@ -65,10 +66,18 @@ public class LimitedRegionWrapperQueue extends DelegateQueueCoordinator {
|
||||
CompoundTag tag = id.getNbtData();
|
||||
StateWrapper sw = new StateWrapper(tag);
|
||||
try {
|
||||
if (useOtherRestoreTagMethod && getWorld() != null) {
|
||||
sw.restoreTag(getWorld().getName(), x, y, z);
|
||||
} else {
|
||||
sw.restoreTag(limitedRegion.getBlockState(x, y, z).getBlock());
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
LOGGER.error("Error attempting to populate tile entity into the world at location {},{},{}", x, y, z, e);
|
||||
return false;
|
||||
} catch (IllegalStateException e) {
|
||||
useOtherRestoreTagMethod = true;
|
||||
LOGGER.warn("IllegalStateException attempting to populate tile entity into the world at location {},{},{}. " +
|
||||
"Possibly on <=1.17.1, switching to secondary method.", x, y, z, e);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
Loading…
Reference in New Issue
Block a user