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

Update to 1.15.1

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-17 19:41:51 -06:00
parent 3984c3706f
commit bdb7592c66
9 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0060-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From 12eadd5e5f9b5e9847b9eb9567dd7e39df4bb074 Mon Sep 17 00:00:00 2001
From 60d581d85c6303cfddcbb8404c07ac16f90820f8 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Allow leashing villagers
3 files changed, 10 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 53b45215bc..b417501cea 100644
index 116820dd8..f9bbc0be4 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1050,6 +1050,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -22,10 +22,10 @@ index 53b45215bc..b417501cea 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 12da4a22b8..8b036c3b53 100644
index 4ddeb8c29..51b9bfd33 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -981,4 +981,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -984,4 +984,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
return optional.isPresent() && optional1.isPresent() ? i - ((MinecraftSerializableLong) optional.get()).a() < 24000L && i - ((MinecraftSerializableLong) optional1.get()).a() < 36000L : false;
}
@@ -38,7 +38,7 @@ index 12da4a22b8..8b036c3b53 100644
+ // Purpur - end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 569c5b3442..7ab88bd640 100644
index 569c5b344..7ab88bd64 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -260,9 +260,11 @@ public class PurpurConfig {