still merging.
This commit is contained in:
parent
8a199b4074
commit
a38e12fbe6
@ -256,7 +256,7 @@ public class Gate implements ConfigurationSerializable {
|
|||||||
id = map.get(idKey).toString().toLowerCase();
|
id = map.get(idKey).toString().toLowerCase();
|
||||||
location = (Location) map.get(locationKey);
|
location = (Location) map.get(locationKey);
|
||||||
exit = (Location) map.get(exitKey);
|
exit = (Location) map.get(exitKey);
|
||||||
|
material = new GateMaterial((String)map.get(materialKey));
|
||||||
isOpen = (Boolean) map.get(isOpenKey);
|
isOpen = (Boolean) map.get(isOpenKey);
|
||||||
allowsVehicles = (Boolean) map.get(allowsVehiclesKey);
|
allowsVehicles = (Boolean) map.get(allowsVehiclesKey);
|
||||||
gateBlockLocations = (Set<Location>) map.get(gateBlocksKey);
|
gateBlockLocations = (Set<Location>) map.get(gateBlocksKey);
|
||||||
@ -280,10 +280,10 @@ public class Gate implements ConfigurationSerializable {
|
|||||||
Map<String, Object> retVal = new HashMap<>();
|
Map<String, Object> retVal = new HashMap<>();
|
||||||
|
|
||||||
retVal.put(idKey, id);
|
retVal.put(idKey, id);
|
||||||
retVal.put(locationKey, LocationUtil.serializeLocation(location));
|
|
||||||
retVal.put(isOpenKey, isOpen);
|
retVal.put(isOpenKey, isOpen);
|
||||||
retVal.put(allowsVehiclesKey, allowsVehicles);
|
retVal.put(allowsVehiclesKey, allowsVehicles);
|
||||||
retVal.put(gateBlocksKey, gateBlockLocations);
|
retVal.put(gateBlocksKey, gateBlockLocations);
|
||||||
|
retVal.put(materialKey, material.toString());
|
||||||
|
|
||||||
if (exit != null) {
|
if (exit != null) {
|
||||||
retVal.put(exitKey, exit.serialize());
|
retVal.put(exitKey, exit.serialize());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user