still merging.

This commit is contained in:
Tobias Ottenweller 2017-01-01 15:20:28 +01:00
parent 8a199b4074
commit a38e12fbe6

View File

@ -256,7 +256,7 @@ public class Gate implements ConfigurationSerializable {
id = map.get(idKey).toString().toLowerCase();
location = (Location) map.get(locationKey);
exit = (Location) map.get(exitKey);
material = new GateMaterial((String)map.get(materialKey));
isOpen = (Boolean) map.get(isOpenKey);
allowsVehicles = (Boolean) map.get(allowsVehiclesKey);
gateBlockLocations = (Set<Location>) map.get(gateBlocksKey);
@ -280,10 +280,10 @@ public class Gate implements ConfigurationSerializable {
Map<String, Object> retVal = new HashMap<>();
retVal.put(idKey, id);
retVal.put(locationKey, LocationUtil.serializeLocation(location));
retVal.put(isOpenKey, isOpen);
retVal.put(allowsVehiclesKey, allowsVehicles);
retVal.put(gateBlocksKey, gateBlockLocations);
retVal.put(materialKey, material.toString());
if (exit != null) {
retVal.put(exitKey, exit.serialize());