40 lines
2.0 KiB
Diff
40 lines
2.0 KiB
Diff
diff --git a/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java b/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java
|
|
index 0cfdf51..f320b33 100644
|
|
--- a/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java
|
|
+++ b/src/com/watabou/pixeldungeon/actors/mobs/Mimic.java
|
|
@@ -64,7 +64,7 @@ public class Mimic extends Mob {
|
|
@Override
|
|
public void restoreFromBundle( Bundle bundle ) {
|
|
super.restoreFromBundle( bundle );
|
|
- items = new ArrayList<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) );
|
|
+ items = new ArrayList<Item>( (Collection<Item>) ((Collection<?>) bundle.getCollection( ITEMS )) );
|
|
adjustStats( bundle.getInt( LEVEL ) );
|
|
}
|
|
|
|
diff --git a/src/com/watabou/pixeldungeon/items/Heap.java b/src/com/watabou/pixeldungeon/items/Heap.java
|
|
index 70c9d8c..deac89d 100644
|
|
--- a/src/com/watabou/pixeldungeon/items/Heap.java
|
|
+++ b/src/com/watabou/pixeldungeon/items/Heap.java
|
|
@@ -360,7 +360,7 @@ public class Heap implements Bundlable {
|
|
public void restoreFromBundle( Bundle bundle ) {
|
|
pos = bundle.getInt( POS );
|
|
type = Type.valueOf( bundle.getString( TYPE ) );
|
|
- items = new LinkedList<Item>( (Collection<? extends Item>) bundle.getCollection( ITEMS ) );
|
|
+ items = new LinkedList<Item>( (Collection<Item>) ((Collection<?>) bundle.getCollection( ITEMS )) );
|
|
}
|
|
|
|
@Override
|
|
diff --git a/src/com/watabou/pixeldungeon/levels/RegularLevel.java b/src/com/watabou/pixeldungeon/levels/RegularLevel.java
|
|
index fa86652..9d5d102 100644
|
|
--- a/src/com/watabou/pixeldungeon/levels/RegularLevel.java
|
|
+++ b/src/com/watabou/pixeldungeon/levels/RegularLevel.java
|
|
@@ -682,7 +682,7 @@ public abstract class RegularLevel extends Level {
|
|
public void restoreFromBundle( Bundle bundle ) {
|
|
super.restoreFromBundle( bundle );
|
|
|
|
- rooms = new HashSet<Room>( (Collection<? extends Room>) bundle.getCollection( "rooms" ) );
|
|
+ rooms = new HashSet<Room>( (Collection<Room>) ((Collection<?>) bundle.getCollection( "rooms" )) );
|
|
for (Room r : rooms) {
|
|
if (r.type == Type.WEAK_FLOOR) {
|
|
weakFloorCreated = true;
|