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

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 3b36f995d5ae145ef691c4d1cd2dcb900a7ca302 Mon Sep 17 00:00:00 2001
From 81f64701611873719511ea2e2254cad9000789a7 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,7 +13,7 @@ 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 4979f77b7..475c3ec63 100644
index 4aac81d3a5..1c110c15ae 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> {
@@ -38,20 +38,20 @@ index 4979f77b7..475c3ec63 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 f8ef10f90..6f3cee8c1 100644
index d1a88960bd..fee6875274 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 dY(); } // Purpur - OBFHELPER
public boolean dY() {
+ public boolean hasTrader() { return dZ(); } // Purpur - OBFHELPER
public boolean dZ() {
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 000000000..eb7213217
index 0000000000..0cb1b117fa
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityVillagerShop.java
@@ -0,0 +1,227 @@
@@ -137,12 +137,12 @@ index 000000000..eb7213217
+ }
+
+ @Override
+ public int dV() { // getExp
+ public int dW() { // getExp
+ return 0;
+ }
+
+ @Override
+ public boolean ea() { // showProfessionProgressBar
+ public boolean eb() { // showProfessionProgressBar
+ return false;
+ }
+
@@ -153,7 +153,7 @@ index 000000000..eb7213217
+ itemstack.a(entityhuman, this, enumhand);
+ return true;
+ }
+ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.dY() && !this.isSleeping()) {
+ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.hasTrader() && !this.isSleeping()) {
+ if (enumhand == EnumHand.MAIN_HAND) {
+ entityhuman.a(StatisticList.TALKED_TO_VILLAGER);
+ }
@@ -188,7 +188,7 @@ index 000000000..eb7213217
+ }
+
+ @Override
+ protected void ef() { // setupTradeOffers
+ protected void ei() { // setupTradeOffers
+ // do not do anything
+ }
+
@@ -272,7 +272,7 @@ index 000000000..eb7213217
+ return; // already on a path
+ }
+ BlockPosition home = villager.getHome();
+ if (!home.a(villager.ch(), range)) {
+ if (!home.a(villager.getHome(), range)) {
+ Vec3D direction = new Vec3D(home).add(-villager.locX, -villager.locY, -villager.locZ).d(); // normalize
+ Vec3D target = direction.a(10.0D).add(villager.locX, villager.locY, villager.locZ); // scale
+ villager.navigation.setDestination(target.x, target.y, target.z, speed);
@@ -283,7 +283,7 @@ index 000000000..eb7213217
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 856ff22b0..8ed86e25f 100644
index d8da790aec..b044c82b14 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 {
@@ -294,7 +294,7 @@ index 856ff22b0..8ed86e25f 100644
public boolean a(double d0, double d1, double d2, double d3) {
return this.a(this.a(d0, d1, d2), d3);
}
@@ -255,6 +256,7 @@ public abstract class NavigationAbstract {
@@ -239,6 +240,7 @@ public abstract class NavigationAbstract {
}
@@ -303,7 +303,7 @@ index 856ff22b0..8ed86e25f 100644
return this.c == null || this.c.b();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
index 18520fec0..307331e37 100644
index 18520fec05..307331e377 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
@@ -20,7 +20,7 @@ public class CraftAbstractVillager extends CraftAgeable implements AbstractVilla