From 90e5bbaac05caf547ceea57d430f16a03c4192a7 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Thu, 17 Sep 2020 22:41:40 -0400
Subject: [PATCH] rebase

---
 assets/common/items/armor/starter/glider.ron | 2 +-
 common/src/loadout_builder.rs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/common/items/armor/starter/glider.ron b/assets/common/items/armor/starter/glider.ron
index 1fbc908b57..087f4b16b5 100644
--- a/assets/common/items/armor/starter/glider.ron
+++ b/assets/common/items/armor/starter/glider.ron
@@ -1,4 +1,4 @@
-Item(
+ItemDef(
     name: "Swift Glider",
     description: "Thank goodness for big pockets",
     kind: Glider(
diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs
index 6ce34b0e8e..24d41c39ab 100644
--- a/common/src/loadout_builder.rs
+++ b/common/src/loadout_builder.rs
@@ -55,7 +55,7 @@ impl LoadoutBuilder {
         .lantern(Some(Item::new_from_asset_expect(
             "common.items.armor.starter.lantern",
         )))
-        .glider(Some(ItemAsset::load_expect_cloned(
+        .glider(Some(Item::new_from_asset_expect(
             "common.items.armor.starter.glider",
         )))
     }