Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
14513c3c Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2019-09-13 10:27:33 -05:00
parent c349c48fb0
commit 394c0f02f8
58 changed files with 114 additions and 168 deletions

View File

@@ -1,42 +0,0 @@
From fd70dff76d52c53afca8555871d9840e79435886 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 17 Aug 2019 15:27:09 -0500
Subject: [PATCH] Add option for zombies targetting turtle eggs
---
src/main/java/net/minecraft/server/EntityZombie.java | 2 +-
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 96676a786..b426941f5 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -48,7 +48,7 @@ public class EntityZombie extends EntityMonster {
@Override
protected void initPathfinder() {
this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
- this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3));
+ if (net.pl3x.purpur.PurpurConfig.zombieTargetsTurtleEggs)this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3)); // Purpur
this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 8.0F));
this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
this.l();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e2b252685..c548af4bf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -264,6 +264,11 @@ public class PurpurConfig {
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
}
+ public static boolean zombieTargetsTurtleEggs = true;
+ private static void zombieSettings() {
+ zombieTargetsTurtleEggs = getBoolean("settings.mobs.zombie.target-turtle-eggs", zombieTargetsTurtleEggs);
+ }
+
public static float zombieHorseSpawnChance = 0F;
private static void zombieHorseSettings() {
zombieHorseSpawnChance = (float) getDouble("settings.mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
--
2.23.0.rc1