Skip to content

Commit

Permalink
Cast error in RegularLevel and Heap
Browse files Browse the repository at this point in the history
The (Collection<? extends Item>) bundle.getCollection(ITEM) cast fails
at compile time because Item extends (well, implements) Bundlable, not
the opposite.
  • Loading branch information
Lertsenem committed Jul 29, 2014
1 parent 33c27cd commit cc04315
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/com/watabou/pixeldungeon/items/Heap.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public void destroy() {
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
Expand Down
2 changes: 1 addition & 1 deletion src/com/watabou/pixeldungeon/levels/RegularLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ public void storeInBundle( Bundle bundle ) {
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;
Expand Down

0 comments on commit cc04315

Please sign in to comment.