Merging Source v1.7.2: item changes

src/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java

@@ -84,12 +84,11 @@ public class Bag extends Item implements Iterable<Item> {
 			return false;
 		}
 	}
-	
-	@Override
-	public Item detach( Bag container ) {
-		owner = null;
-		return super.detach( container );
-	}
+
+    @Override
+    public void onDetach( ) {
+        this.owner = null;
+    }
 	
 	@Override
 	public boolean isUpgradable() {

src/com/shatteredpixel/shatteredpixeldungeon/items/bags/WandHolster.java

@@ -48,16 +48,13 @@ public class WandHolster extends Bag {
 			return false;
 		}
 	}
-	
+
 	@Override
-	public Item detach( Bag container ) {
-		
-		for (Item item : items) {
-			((Wand)item).stopCharging();
-		}
-		
-		return super.detach( container );
-	}
+    public void onDetach( ) {
+        for (Item item : items) {
+            ((Wand)item).stopCharging();
+        }
+    }
 	
 	@Override
 	public int price() {