From 14080da693a061c85b733b598c21e8d6a6efc856 Mon Sep 17 00:00:00 2001
From: James Melkonian <jemelkonian@gmail.com>
Date: Thu, 3 Feb 2022 21:33:43 -0800
Subject: [PATCH] Fix rebase

---
 world/src/site2/gen.rs | 8 --------
 world/src/site2/mod.rs | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/world/src/site2/gen.rs b/world/src/site2/gen.rs
index 8ce923b269..c40374cd3c 100644
--- a/world/src/site2/gen.rs
+++ b/world/src/site2/gen.rs
@@ -880,14 +880,6 @@ impl<'a> PrimitiveRef<'a> {
     pub fn repeat(self, offset: Vec3<i32>, count: i32) -> PrimitiveRef<'a> {
         self.painter.prim(Primitive::repeat(self, offset, count))
     }
-
-    pub fn translate(self, trans: Vec3<i32>) -> PrimitiveRef<'a> {
-        self.painter.prim(Primitive::translate(self, trans))
-    }
-
-    pub fn rotate(self, rot: Mat3<i32>) -> PrimitiveRef<'a> {
-        self.painter.prim(Primitive::rotate(self, rot))
-    }
 }
 
 pub trait Structure {
diff --git a/world/src/site2/mod.rs b/world/src/site2/mod.rs
index 94109edbe9..773d6ac814 100644
--- a/world/src/site2/mod.rs
+++ b/world/src/site2/mod.rs
@@ -967,7 +967,7 @@ impl Site {
                 PlotKind::Workshop(workshop) => workshop.render_collect(self, canvas),
                 PlotKind::Castle(castle) => castle.render_collect(self, canvas),
                 PlotKind::Dungeon(dungeon) => dungeon.render_collect(self, canvas),
-                PlotKind::Gnarling(gnarling) => gnarling.render_collect(self, &canvas.land()),
+                PlotKind::Gnarling(gnarling) => gnarling.render_collect(self, &canvas),
                 PlotKind::GiantTree(giant_tree) => giant_tree.render_collect(self, canvas),
                 _ => continue,
             };