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

1.14.4 - Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9fe63a16 Update to 1.14.4 (#2333)
This commit is contained in:
William Blake Galbreath
2019-07-19 23:59:11 -05:00
parent 6ea93ffa52
commit c3fd092026
27 changed files with 351 additions and 3377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/server/0012-Villager-shops.patch
View File

@@ -1,4 +1,4 @@
From 81f64701611873719511ea2e2254cad9000789a7 Mon Sep 17 00:00:00 2001
From 20da8ee08299ed28fea37dbff0fa8dafb2e59485 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 11 May 2019 01:31:50 -0500
Subject: [PATCH] Villager shops
@@ -13,10 +13,10 @@ Subject: [PATCH] Villager shops
create mode 100644 src/main/java/net/minecraft/server/EntityVillagerShop.java
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 4aac81d3a5..1c110c15ae 100644
index 84aa1db728..d92fbea4c7 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -118,6 +118,7 @@ public class EntityTypes<T extends Entity> {
@@ -117,6 +117,7 @@ public class EntityTypes<T extends Entity> {
public static final EntityTypes<EntityLightning> LIGHTNING_BOLT = a("lightning_bolt", EntityTypes.a.a(EnumCreatureType.MISC).b().a(0.0F, 0.0F));
public static final EntityTypes<EntityHuman> PLAYER = a("player", EntityTypes.a.a(EnumCreatureType.MISC).b().a().a(0.6F, 1.8F));
public static final EntityTypes<EntityFishingHook> FISHING_BOBBER = a("fishing_bobber", EntityTypes.a.a(EnumCreatureType.MISC).b().a().a(0.25F, 0.25F));
@@ -24,12 +24,12 @@ index 4aac81d3a5..1c110c15ae 100644
private final EntityTypes.b<T> aZ;
private final EnumCreatureType ba;
private final boolean bb;
@@ -138,6 +139,12 @@ public class EntityTypes<T extends Entity> {
@@ -136,6 +137,12 @@ public class EntityTypes<T extends Entity> {
}
// Purpur start
+ private static <T extends Entity> EntityTypes<T> register(String name, String extendFrom, EntityTypes.a entitytypes_a) {
+ Map<Object, Type<?>> dataTypes = (Map<Object, Type<?>>) DataConverterRegistry.a().getSchema(DataFixUtils.makeKey(SharedConstants.a().getWorldVersion())).findChoiceType(DataConverterTypes.o).types(); // entity_tree
+ Map<Object, com.mojang.datafixers.types.Type<?>> dataTypes = (Map<Object, com.mojang.datafixers.types.Type<?>>) DataConverterRegistry.a().getSchema(DataFixUtils.makeKey(SharedConstants.a().getWorldVersion())).findChoiceType(DataConverterTypes.o).types(); // entity_tree
+ dataTypes.put("minecraft:" + name, dataTypes.get("minecraft:" + extendFrom));
+ return a(name, entitytypes_a);
+ }
@@ -38,20 +38,20 @@ index 4aac81d3a5..1c110c15ae 100644
return IRegistry.ENTITY_TYPE.get(key);
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index d1a88960bd..fee6875274 100644
index f161ccb979..497dec811c 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -68,6 +68,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
return this.tradingPlayer;
}
+ public boolean hasTrader() { return dZ(); } // Purpur - OBFHELPER
public boolean dZ() {
+ public boolean hasTrader() { return dY(); } // Purpur - OBFHELPER
public boolean dY() {
return this.tradingPlayer != null;
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerShop.java b/src/main/java/net/minecraft/server/EntityVillagerShop.java
new file mode 100644
index 0000000000..0cb1b117fa
index 0000000000..cdb7655c3f
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityVillagerShop.java
@@ -0,0 +1,227 @@
@@ -137,12 +137,12 @@ index 0000000000..0cb1b117fa
+ }
+
+ @Override
+ public int dW() { // getExp
+ public int getExperience() { // getExp
+ return 0;
+ }
+
+ @Override
+ public boolean eb() { // showProfessionProgressBar
+ public boolean ea() { // showProfessionProgressBar
+ return false;
+ }
+
@@ -188,7 +188,7 @@ index 0000000000..0cb1b117fa
+ }
+
+ @Override
+ protected void ei() { // setupTradeOffers
+ protected void eh() { // setupTradeOffers
+ // do not do anything
+ }
+
@@ -283,18 +283,18 @@ index 0000000000..0cb1b117fa
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index d8da790aec..b044c82b14 100644
index 66e10108d6..278f36106d 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -123,6 +123,7 @@ public abstract class NavigationAbstract {
@@ -146,6 +146,7 @@ public abstract class NavigationAbstract {
}
}
+ public boolean setDestination(double x, double y, double z, double speed) { return a(x, y, z, speed); } // Purpur - OBFHELPER
public boolean a(double d0, double d1, double d2, double d3) {
return this.a(this.a(d0, d1, d2), d3);
return this.a(this.a(d0, d1, d2, 1), d3);
}
@@ -239,6 +240,7 @@ public abstract class NavigationAbstract {
@@ -262,6 +263,7 @@ public abstract class NavigationAbstract {
}