diff --git a/patches/server/0156-EMC-Configurable-disable-give-dropping.patch b/patches/server/0156-EMC-Configurable-disable-give-dropping.patch index 1ffa50439..46acb5c3f 100644 --- a/patches/server/0156-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0156-EMC-Configurable-disable-give-dropping.patch @@ -4,11 +4,11 @@ Date: Thu, 14 Jan 2016 00:49:14 -0500 Subject: [PATCH] EMC - Configurable disable give dropping Modified version of a patch by Aikar from EMC. Adds a config option in -purur.yml to disable the /give command from dropping items on the floor -when a player's inventory is full. +purpur.yml to disable the /give command from dropping items on the +floor when a player's inventory is full. diff --git a/src/main/java/net/minecraft/server/CommandGive.java b/src/main/java/net/minecraft/server/CommandGive.java -index 1d22c45af8..7bf90f27fd 100644 +index 1d22c45af..7bf90f27f 100644 --- a/src/main/java/net/minecraft/server/CommandGive.java +++ b/src/main/java/net/minecraft/server/CommandGive.java @@ -35,6 +35,7 @@ public class CommandGive { @@ -20,7 +20,7 @@ index 1d22c45af8..7bf90f27fd 100644 itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c06f7dc24f..dc8fb4a29d 100644 +index 3c4c099be..de0776f8c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -188,6 +188,11 @@ public class PurpurConfig { diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh index b15732ad3..ac6c662e0 100755 --- a/scripts/upstreamCommit.sh +++ b/scripts/upstreamCommit.sh @@ -15,7 +15,7 @@ logsuffix="$logsuffix\n\nPaper Changes:\n$paper" if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi fi - disclaimer="Upstream has released updates that appears to apply and compile correctly" + disclaimer="Upstream has released updates that appear to apply and compile correctly" if [ -n "$1" ]; then disclaimer=("$@")