diff --git a/pom.xml b/pom.xml index 8ed7e81ea..e13057edd 100644 --- a/pom.xml +++ b/pom.xml @@ -210,8 +210,8 @@ - nallar-repo - https://repo.nallar.me/ + piratescode + https://nexus.piratescode.co.uk/ spongepowered-repo diff --git a/scripts/build.sh b/scripts/build.sh old mode 100644 new mode 100755 index 0589d03fd..d7917b204 --- a/scripts/build.sh +++ b/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) diff --git a/scripts/inst.sh b/scripts/inst.sh old mode 100644 new mode 100755 diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCampfire.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCampfire.java index a9fcc7ab9..9761b082e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCampfire.java +++ b/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 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"); diff --git a/work/Paper b/work/Paper index 10c29e736..1c3843626 160000 --- a/work/Paper +++ b/work/Paper @@ -1 +1 @@ -Subproject commit 10c29e7369df57f7bdb68bf8b4fdc6f229e6a014 +Subproject commit 1c384362669bd7636dfa341bcabdf7a523e287c9