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

rebuild patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-27 21:33:44 -06:00
parent b17230ad50
commit 7edbf259ba
22 changed files with 123 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0101-Add-item-entity-options.patch
View File

@@ -1,4 +1,4 @@
From b3ee95323a816acaaa53abed4dea53fdf6494da6 Mon Sep 17 00:00:00 2001
From 54581abda4cb33151ebaec820b689496a60ae84c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Feb 2020 15:54:08 -0600
Subject: [PATCH] Add item entity options
@@ -6,8 +6,8 @@ Subject: [PATCH] Add item entity options
---
.../java/net/minecraft/server/Entity.java | 1 +
.../java/net/minecraft/server/EntityItem.java | 9 ++++++++-
.../net/pl3x/purpur/PurpurWorldConfig.java | 20 +++++++++++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
.../net/pl3x/purpur/PurpurWorldConfig.java | 19 +++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f1c749c38f..98aef47056 100644
@@ -56,7 +56,7 @@ index bbb9ca1efc..262a7935e7 100644
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5054f7b6a3..93df565c02 100644
index 4d32706fa1..7aed41f0f9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -5,6 +5,8 @@ import net.minecraft.server.Block;
@@ -68,15 +68,7 @@ index 5054f7b6a3..93df565c02 100644
import net.minecraft.server.MinecraftKey;
import org.bukkit.configuration.ConfigurationSection;
import org.spigotmc.SpigotWorldConfig;
@@ -14,6 +16,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
+import java.util.stream.Collectors;
import static net.pl3x.purpur.PurpurConfig.log;
@@ -185,6 +188,10 @@ public class PurpurWorldConfig {
@@ -185,6 +187,10 @@ public class PurpurWorldConfig {
public Map<Block, Double> controllableMinecartsBlockSpeeds = new HashMap<>();
public boolean disableDropsOnCrammingDeath = false;
public boolean fixClimbingBypassingCrammingRule = false;
@@ -87,7 +79,7 @@ index 5054f7b6a3..93df565c02 100644
public boolean milkCuresBadOmen = true;
public String playerDeathExpDropEquation = "expLevel * 7";
public int playerDeathExpDropMax = 100;
@@ -214,6 +221,19 @@ public class PurpurWorldConfig {
@@ -214,6 +220,19 @@ public class PurpurWorldConfig {
}
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);