Merge pull request #103 from braddevans/master

update campfire to the latest 1.14.4 version from craftbukkit

.circleci/config.yml

@@ -28,7 +28,8 @@ jobs:
         - v1-dep-
     - run: git config --global user.email "circle@circleci.com"
     - run: git config --global user.name "CircleCI"
-    - run: chmod +x scripts/inst.sh
+    - run: chmod -Rv +x scripts/
+    - run: ./scripts/build.sh 
     - run: ./scripts/inst.sh --setup --remote
     # Save dependency cache
     - save_cache:

.travis.yml

@@ -6,7 +6,8 @@ install: true
 script:
   - git config --global user.email "circle@circleci.com"
   - git config --global user.name "CircleCI"
-  - chmod +x ./scripts/inst.sh
+  - chmod -Rv +x scripts/
+  - ./scripts/build.sh
   - ./scripts/inst.sh --setup --remote
 after_success:
   - rm -rf push

pom.xml

@@ -210,8 +210,8 @@
         </repository>
         <!-- Akarin -->
         <repository>
-            <id>nallar-repo</id>
-            <url>https://repo.nallar.me/</url>
+            <id>piratescode</id>
+            <url>https://nexus.piratescode.co.uk/</url>
         </repository>
         <repository>
             <id>spongepowered-repo</id>

scripts/build.sh

@@ -35,7 +35,7 @@ echo "[Akarin] Ready to build"
 		\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
 		\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
 		\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
-		mvn clean install -DskipTests
+		mvn clean install -Dmaven.test.skip=true
 	else
 		rm -rf Paper-API/src
 		rm -rf Paper-Server/src
@@ -44,7 +44,7 @@ echo "[Akarin] Ready to build"
 		\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
 		\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
 		\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
-		mvn clean install -DskipTests
+		mvn clean install -Dmaven.test.skip=true
 	fi
 	
 	minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)

src/main/java/org/bukkit/craftbukkit/block/impl/CraftCampfire.java

@@ -3,7 +3,7 @@
  */
 package org.bukkit.craftbukkit.block.impl;
 
-public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Campfire, org.bukkit.block.data.Lightable, org.bukkit.block.data.Waterlogged {
+public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.CraftBlockData implements org.bukkit.block.data.type.Campfire, org.bukkit.block.data.Directional, org.bukkit.block.data.Lightable, org.bukkit.block.data.Waterlogged {
 
     public CraftCampfire() {
         super();
@@ -27,6 +27,25 @@ public final class CraftCampfire extends org.bukkit.craftbukkit.block.data.Craft
         set(SIGNAL_FIRE, signalFire);
     }
 
+    // org.bukkit.craftbukkit.block.data.CraftDirectional
+
+    private static final net.minecraft.server.BlockStateEnum<?> FACING = getEnum(net.minecraft.server.BlockCampfire.class, "facing");
+
+    @Override
+    public org.bukkit.block.BlockFace getFacing() {
+        return get(FACING, org.bukkit.block.BlockFace.class);
+    }
+
+    @Override
+    public void setFacing(org.bukkit.block.BlockFace facing) {
+        set(FACING, facing);
+    }
+
+    @Override
+    public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
+        return getValues(FACING, org.bukkit.block.BlockFace.class);
+    }
+
     // org.bukkit.craftbukkit.block.data.CraftLightable
 
     private static final net.minecraft.server.BlockStateBoolean LIT = getBoolean(net.minecraft.server.BlockCampfire.class, "lit");