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

Add /purpur command for reloading purpur.yml

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-29 19:40:42 -05:00
parent 65f744bbdb
commit 31b9908398
12 changed files with 135 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From b515e212f65d06776d89622a0a1ae9a4d19ab25a Mon Sep 17 00:00:00 2001
From a467968ed0cd18565c3c27a9a612dc6305722436 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -3095,7 +3095,7 @@ index 80354beb4d..f1561a927e 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 3396983adf..15a75c9404 100644
index 2a3997149a..9dfddd980b 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -35,6 +35,7 @@ public class EntityZombie extends EntityMonster {
@@ -4086,10 +4086,10 @@ index a2fc2cd802..8f064526b2 100644
return (d0 * d0 >= 0.029999999329447746D || this.b.pitch == 0.0F || Math.abs(this.b.pitch) >= 10.0F || !this.b.isInWater()) && !this.b.onGround;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 25112d6570..7239ad273a 100644
index 1666412782..1fe54bb161 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -111,6 +111,11 @@ public class PurpurConfig {
@@ -125,6 +125,11 @@ public class PurpurConfig {
return config.getString(path, config.getString(path));
}
@@ -4101,7 +4101,7 @@ index 25112d6570..7239ad273a 100644
public static int feedMushroomsToCows = 5;
private static void cowsSettings() {
feedMushroomsToCows = getInt("settings.mobs.cow.feed-mushrooms-for-mooshroom", feedMushroomsToCows);
@@ -122,4 +127,117 @@ public class PurpurConfig {
@@ -136,4 +141,117 @@ public class PurpurConfig {
snowmanDropsPumpkin = getBoolean("settings.mobs.snow_golem.drops-pumpkin-when-sheared", snowmanDropsPumpkin);
snowmanPumpkinPutBack = getBoolean("settings.mobs.snow_golem.pumpkin-can-be-added-back", snowmanPumpkinPutBack);
}