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

Close #12 - Make llamas WASD controllable

Browse Source
This commit is contained in:
William Blake Galbreath
2020-04-01 16:08:48 -05:00
parent 193b218210
commit dc15732b53
20 changed files with 134 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0091-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From e02c6ef31c1c4a151a1ede4d00be701d026b3839 Mon Sep 17 00:00:00 2001
From e51f995e94eef23aa8499913b05dc78f816320d0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 3 Oct 2019 18:08:03 -0500
Subject: [PATCH] Allow leashing villagers
@@ -11,7 +11,7 @@ Subject: [PATCH] Allow leashing villagers
4 files changed, 19 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 66b4831949..bac6cea1ff 100644
index 66b483194..bac6cea1f 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -23,7 +23,7 @@ index 66b4831949..bac6cea1ff 100644
if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index b31f614e6b..315440b3fb 100644
index b31f614e6..315440b3f 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -1006,4 +1006,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -39,7 +39,7 @@ index b31f614e6b..315440b3fb 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
index 14ca5fc367..427c589075 100644
index 14ca5fc36..427c58907 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
@@ -283,4 +283,11 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8eff6a6dd6..097ff8ae35 100644
index 5bf4535b6..ed41e3326 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -781,6 +781,7 @@ public class PurpurWorldConfig {
@@ -785,6 +785,7 @@ public class PurpurWorldConfig {
public int villagerBrainTicks = 1;
public boolean villagerUseBrainTicksOnlyWhenLagging = true;
public boolean villagerFollowEmeraldBlock = false;
@@ -66,7 +66,7 @@ index 8eff6a6dd6..097ff8ae35 100644
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -788,17 +789,20 @@ public class PurpurWorldConfig {
@@ -792,17 +793,20 @@ public class PurpurWorldConfig {
villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);