Merge remote-tracking branch 'origin/api-12' into api-17

Author: aromaa

src/main/java/org/spongepowered/api/data/Keys.java

@@ -701,6 +701,11 @@ public final class Keys {
      */
     public static final Key<Value<Boolean>> CAN_MOVE_ON_LAND = Keys.key(ResourceKey.sponge("can_move_on_land"), Boolean.class);
 
+    /**
+     * Whether a {@link Living} can pick up loot.
+     */
+    public static final Key<Value<Boolean>> CAN_PICK_UP_LOOT = Keys.key(ResourceKey.sponge("can_pick_up_loot"), Boolean.class);
+
     /**
      * Whether a {@link FallingBlock} will place itself upon landing.
      */

src/main/java/org/spongepowered/api/entity/attribute/AttributeHolder.java

@@ -52,4 +52,24 @@ default Optional<Attribute> attribute(final Supplier<? extends AttributeType> ty
      * @return An attribute, if present.
      */
     Optional<Attribute> attribute(final AttributeType type);
+
+    /**
+     * Gets an immutable copy of the default {@link Attribute}
+     * from this entity.
+     *
+     * @param type The attribute type.
+     * @return An attribute, if present.
+     */
+    default Optional<Attribute> defaultAttribute(final Supplier<? extends AttributeType> type) {
+        return this.defaultAttribute(type.get());
+    }
+
+    /**
+     * Gets an immutable copy of the default {@link Attribute}
+     * from this entity.
+     *
+     * @param type The attribute type.
+     * @return An attribute, if present.
+     */
+    Optional<Attribute> defaultAttribute(final AttributeType type);
 }