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

Move per-world mob options around in config

Browse Source
This commit is contained in:
William Blake Galbreath
2020-01-03 01:41:07 -06:00
parent 8d40b034fc
commit f518f72269
17 changed files with 189 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0082-Villagers-follow-emerald-blocks.patch
View File

@@ -1,4 +1,4 @@
From 0a7cb9e8304d9aebdda3063c6d1076a25e804bce Mon Sep 17 00:00:00 2001
From 3f64c9d3b117dfff3f18d61e4510e362242c1436 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 29 Nov 2019 22:10:12 -0600
Subject: [PATCH] Villagers follow emerald blocks
@@ -9,10 +9,10 @@ Subject: [PATCH] Villagers follow emerald blocks
2 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 8b036c3b53..22b6e02895 100644
index 4187bb6026..d8cbe549d4 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -29,6 +29,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
@@ -25,6 +25,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
public class EntityVillager extends EntityVillagerAbstract implements ReputationHandler, VillagerDataHolder {
@@ -20,7 +20,7 @@ index 8b036c3b53..22b6e02895 100644
private static final DataWatcherObject<VillagerData> bz = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q);
public static final Map<Item, Integer> bx = ImmutableMap.of(Items.BREAD, 4, Items.POTATO, 1, Items.CARROT, 1, Items.BEETROOT, 1);
private static final Set<Item> bA = ImmutableSet.of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[]{Items.BEETROOT_SEEDS});
@@ -70,6 +71,15 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -66,6 +67,15 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
brainTickOffset = getRandom().nextInt(100); // Purpur
}
@@ -37,7 +37,7 @@ index 8b036c3b53..22b6e02895 100644
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 68db82759d..4bf208b35c 100644
index 66f524ebf8..cc4731ccc8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -280,10 +280,12 @@ public class PurpurConfig {
@@ -54,5 +54,5 @@ index 68db82759d..4bf208b35c 100644
public static boolean zombieTargetsTurtleEggs = true;
--
2.24.0.rc1
2.24.0