Permalink
Browse files

Merge branch 'master' of github.com:ujihisa/cloft into ujm

solved Conflicts:
	src/cloft/core.clj
  • Loading branch information...
2 parents 7b3fa6a + a2878af commit 9ce8be461f10113e19ccc2dd7379ac413123dabc @bgnori bgnori committed May 10, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 src/cloft/core.clj
View
@@ -634,14 +634,12 @@
(fn []
(when (safe-to-place? v)
(.strikeLightningEffect world (.getLocation v))
- (.setType v Material/COBBLESTONE)))))
- ]
+ (.setType v Material/COBBLESTONE)))))]
(place-blocks-in-line world start-left end-left block-floor 2)
(place-blocks-in-line world start-center end-center block-floor 2)
(place-blocks-in-line world start-right end-right block-floor 2)
))
-
(defn make-redstone-for-livings [player block]
(let [world (.getWorld player)]
(doseq [e (filter #(instance? LivingEntity %) (.getNearbyEntities player 10 10 10))]

0 comments on commit 9ce8be4

Please sign in to comment.