Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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

16
patches/server/0078-Add-more-llama-API.patch
View File

@@ -1,4 +1,4 @@
From 34ef62606af08a0c7a9466be7f7f403c94415a08 Mon Sep 17 00:00:00 2001
From b709ecc23aa978b8a6e0a889f0c03ccab99da8f4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 22:50:12 -0500
Subject: [PATCH] Add more llama API
@@ -10,7 +10,7 @@ Subject: [PATCH] Add more llama API
3 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 5b87b245f7..00334993fe 100644
index 7a4e64a3d..576179756 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -23,7 +23,7 @@ index 5b87b245f7..00334993fe 100644
public EntityLlama(EntityTypes<? extends EntityLlama> entitytypes, World world) {
super(entitytypes, world);
@@ -69,7 +70,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -79,7 +80,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
if (!this.inventoryChest.getItem(1).isEmpty()) {
nbttagcompound.set("DecorItem", this.inventoryChest.getItem(1).save(new NBTTagCompound()));
}
@@ -32,7 +32,7 @@ index 5b87b245f7..00334993fe 100644
}
@Override
@@ -80,7 +81,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -90,7 +91,11 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
if (nbttagcompound.hasKeyOfType("DecorItem", 10)) {
this.inventoryChest.setItem(1, ItemStack.a(nbttagcompound.getCompound("DecorItem")));
}
@@ -45,7 +45,7 @@ index 5b87b245f7..00334993fe 100644
this.eI();
}
@@ -417,19 +422,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -427,19 +432,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
}
}
@@ -70,7 +70,7 @@ index 5b87b245f7..00334993fe 100644
public boolean fc() {
return this.bK != null;
}
@@ -440,7 +450,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -450,7 +460,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
}
@Nullable
@@ -80,7 +80,7 @@ index 5b87b245f7..00334993fe 100644
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
index e181d83505..8376f1dc4e 100644
index e181d8350..8376f1dc4 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoalLlamaFollow.java
@@ -6,7 +6,7 @@ import java.util.List;
@@ -109,7 +109,7 @@ index e181d83505..8376f1dc4e 100644
double d0 = this.a.h((Entity) this.a.fe());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
index 3f94c5a920..a027634801 100644
index 3f94c5a92..a02763480 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
@@ -65,4 +65,48 @@ public class CraftLlama extends CraftChestedHorse implements Llama, CraftRangedE