/*
 * Copyright 2013 MovingBlocks
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *  http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.terasology.persistence.typeHandling.mathTypes;

import com.google.common.collect.Maps;
import org.terasology.engine.module.UriUtil;
import org.terasology.math.Region3i;
import org.terasology.math.geom.Vector3i;
import org.terasology.persistence.typeHandling.DeserializationContext;
import org.terasology.persistence.typeHandling.PersistedData;
import org.terasology.persistence.typeHandling.PersistedDataMap;
import org.terasology.persistence.typeHandling.SerializationContext;
import org.terasology.persistence.typeHandling.SimpleTypeHandler;

import java.util.Map;

/**
 */
public class Region3iTypeHandler extends SimpleTypeHandler<Region3i> {

    private static final String MIN_FIELD = UriUtil.normalise("min");
    private static final String SIZE_FIELD = UriUtil.normalise("size");

    @Override
    public PersistedData serialize(Region3i value, SerializationContext context) {
        if (value == null) {
            return context.createNull();
        } else {
            Map<String, PersistedData> map = Maps.newLinkedHashMap();
            map.put(MIN_FIELD, context.create(value.min(), Vector3i.class));
            map.put(SIZE_FIELD, context.create(value.size(), Vector3i.class));
            return context.create(map);
        }
    }

    @Override
    public Region3i deserialize(PersistedData data, DeserializationContext context) {
        if (data.isValueMap()) {
            PersistedDataMap map = data.getAsValueMap();
            Vector3i min = context.deserializeAs(map.get(MIN_FIELD), Vector3i.class);
            Vector3i size = context.deserializeAs(map.get(SIZE_FIELD), Vector3i.class);
            return Region3i.createFromMinAndSize(min, size);
        }
        return null;
    }

}

@@ -1969,16 +1969,34 @@
     if (
+!data.isNull() && 
 data.isV

Fix a NullPointerException when deserializing a null Region3i field.