Merge pull request #20 from PPGOME/master

Rebased plugin onto paper, fixed allay culling.

plugin.yml

@@ -3,6 +3,7 @@ version: ${project.version}
 description: Control the mob population
 authors: ["Travis Watkins", "redwall_hp"]
 softdepend: ["LogBlock"]
+api-version: '1.20'
 
 main: nu.nerd.moblimiter.MobLimiter
 

pom.xml

@@ -7,13 +7,13 @@
 
 	<groupId>nu.nerd</groupId>
 	<artifactId>MobLimiter</artifactId>
-	<version>2.1.2</version>
+	<version>2.1.3</version>
 
 
 	<repositories>
 		<repository>
-			<id>spigot-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
 		</repository>
         <repository>
             <id>md_5-releases</id>
@@ -37,9 +37,10 @@
             <version>1.94</version>
         </dependency>
 		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.20-R0.1-SNAPSHOT</version>
+			<groupId>io.papermc.paper</groupId>
+			<artifactId>paper-api</artifactId>
+			<version>1.20.4-R0.1-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 

src/nu/nerd/moblimiter/EntityHelper.java

@@ -56,7 +56,7 @@ public static boolean isSpecialMob(LivingEntity entity) {
         }
 
         // Save the sponge!
-        if (entity.getType() == EntityType.GUARDIAN && ((Guardian)entity).isElder()) {
+        if (entity.getType() == EntityType.ELDER_GUARDIAN) {
             return true;
         }
 
@@ -68,6 +68,12 @@ public static boolean isSpecialMob(LivingEntity entity) {
                 return true;
             }
         }
+        // Don't cull allays who are holding items
+        if(entity.getType() == EntityType.ALLAY) {
+            if(equipment.getItemInMainHand() != null && equipment.getItemInMainHand().getType() != Material.AIR) {
+                return true;
+            }
+        }
 
         return false;