Update pom.

data/plugins/npc/spawns.rb

@@ -1,25 +0,0 @@
-require 'java'
-java_import 'org.apollo.game.model.Npc'
-java_import 'org.apollo.game.model.World'
-java_import 'org.apollo.game.model.Position'
-
-def register(npc)
-	raise "Npc cannot be nil" if npc == nil
-	World.world.register(npc)
-end
-
-### Lumbridge spawns:
-
-# Generic: 
-register Npc.new(4,    Position.new(3232, 3207))    # woman, southernmost house
-register Npc.new(1,    Position.new(3231, 3237))    # man, house by willow tree
-register Npc.new(2,    Position.new(3224, 3240))    # man, house by willow tree
-register Npc.new(5,    Position.new(3229, 3239))    # woman, house by willow tree
-
-# Other:
-register Npc.new(0,    Position.new(3221, 3221))    # hans
-register Npc.new(456,  Position.new(3243, 3210))    # father aereck
-register Npc.new(519,  Position.new(3231, 3203))    # bob from bob's axes
-register Npc.new(520,  Position.new(3212, 3247))    # shopkeeper
-register Npc.new(521,  Position.new(3211, 3245))    # shop assistant
-register Npc.new(2244, Position.new(3232, 3229))    # lumbridge guide

pom.xml

@@ -2,6 +2,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<<<<<<< HEAD
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apollo</artifactId>
   <version>1.0</version>
@@ -44,4 +45,38 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
+=======
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apollo</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <groupId>apollo</groupId>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <testSourceDirectory>test</testSourceDirectory>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jruby</groupId>
+            <artifactId>jruby-complete</artifactId>
+            <version>1.7.10</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>16.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.0.15.Final</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
+>>>>>>> 86a477d2133d3cab6d6d9983e1bb939db088db39