Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix typos

Browse Source
This commit is contained in:
jmp
2020-12-05 03:09:03 -08:00
parent 6e42ce8f1c
commit 47a17072a3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0156-EMC-Configurable-disable-give-dropping.patch
View File

@@ -4,11 +4,11 @@ Date: Thu, 14 Jan 2016 00:49:14 -0500
Subject: [PATCH] EMC - Configurable disable give dropping Subject: [PATCH] EMC - Configurable disable give dropping
Modified version of a patch by Aikar from EMC. Adds a config option in 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 purpur.yml to disable the /give command from dropping items on the
when a player's inventory is full. 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 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 --- a/src/main/java/net/minecraft/server/CommandGive.java
+++ b/src/main/java/net/minecraft/server/CommandGive.java +++ b/src/main/java/net/minecraft/server/CommandGive.java
@@ -35,6 +35,7 @@ public class CommandGive { @@ -35,6 +35,7 @@ public class CommandGive {
@@ -20,7 +20,7 @@ index 1d22c45af8..7bf90f27fd 100644
itemstack.setCount(1); itemstack.setCount(1);
entityitem = entityplayer.drop(itemstack, false); 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 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 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -188,6 +188,11 @@ public class PurpurConfig { @@ -188,6 +188,11 @@ public class PurpurConfig {

2
scripts/upstreamCommit.sh
View File

@@ -15,7 +15,7 @@
logsuffix="$logsuffix\n\nPaper Changes:\n$paper" logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
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 if [ -n "$1" ]; then
disclaimer=("$@") disclaimer=("$@")