summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityGuardian.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntityGuardian.patch')
-rw-r--r--nms-patches/EntityGuardian.patch34
1 files changed, 21 insertions, 13 deletions
diff --git a/nms-patches/EntityGuardian.patch b/nms-patches/EntityGuardian.patch
index 8c419e56..cd30ff32 100644
--- a/nms-patches/EntityGuardian.patch
+++ b/nms-patches/EntityGuardian.patch
@@ -1,21 +1,29 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityGuardian.java Thu Dec 11 13:57:14 2014
-+++ src/main/java/net/minecraft/server/EntityGuardian.java Thu Dec 11 13:55:14 2014
+--- /home/matt/mc-dev-private//net/minecraft/server/EntityGuardian.java 2015-02-26 22:40:22.551608140 +0000
++++ src/main/java/net/minecraft/server/EntityGuardian.java 2015-02-26 22:40:22.551608140 +0000
@@ -14,7 +14,7 @@
- private EntityLiving bn;
- private int bo;
- private boolean bp;
-- private PathfinderGoalRandomStroll bq;
-+ public PathfinderGoalRandomStroll bq; // CraftBukkit - private to public
+ private EntityLiving bo;
+ private int bp;
+ private boolean bq;
+- private PathfinderGoalRandomStroll br;
++ public PathfinderGoalRandomStroll br; // CraftBukkit - public
public EntityGuardian(World world) {
super(world);
-@@ -35,7 +35,8 @@
- this.c = this.b = this.random.nextFloat();
+@@ -35,7 +35,7 @@
+ this.b = this.a = this.random.nextFloat();
}
-- protected void aW() {
-+ // PAIL: Access + rename please
-+ public void aW() { // CraftBukkit - protected to public
- super.aW();
+- protected void initAttributes() {
++ public void initAttributes() { // CraftBukkit - public
+ super.initAttributes();
this.getAttributeInstance(GenericAttributes.e).setValue(6.0D);
this.getAttributeInstance(GenericAttributes.d).setValue(0.5D);
+@@ -516,7 +516,7 @@
+ return (entityliving instanceof EntityHuman || entityliving instanceof EntitySquid) && entityliving.h(this.a) > 9.0D;
+ }
+
+- public boolean apply(Object object) {
++ public boolean apply(EntityLiving object) { // CraftBukkit - fix decompile error
+ return this.a((EntityLiving) object);
+ }
+ }