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

[ci-skip] More attributes work

Browse Source
This commit is contained in:
BillyGalbreath
2020-12-23 09:47:27 -06:00
parent 19ec1c311f
commit 7ad2c5d503
24 changed files with 432 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0110-Ridables.patch
View File

@@ -717,7 +717,7 @@ index 776f3d25a6eeb5e97667dd06c062d1045d1afa81..2e1f2dec17e7761b6534f29bbec813d1
return EntitySpider.eK().a(GenericAttributes.MAX_HEALTH, 12.0D);
}
diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
index 11a612fa390cb0acf37fb84c5d5b6ea926dabad3..a16ecd7edcd0ed081fff254d1f1429b32a4dcfb3 100644
index 8fb5d5c75e79a81ab46af3fbb96ebc41804113c4..ee59a9f272a9caebec8f2329e1e4b22ddd27a0f9 100644
--- a/src/main/java/net/minecraft/server/EntityChicken.java
+++ b/src/main/java/net/minecraft/server/EntityChicken.java
@@ -18,6 +18,16 @@ public class EntityChicken extends EntityAnimal {
@@ -735,9 +735,9 @@ index 11a612fa390cb0acf37fb84c5d5b6ea926dabad3..a16ecd7edcd0ed081fff254d1f1429b3
+ }
+
@Override
protected void initAttributes(World world) {
if (world != null) {
@@ -31,6 +41,7 @@ public class EntityChicken extends EntityAnimal {
protected void initAttributes() {
if (world.purpurConfig.chickenRetaliate) {
@@ -29,6 +39,7 @@ public class EntityChicken extends EntityAnimal {
@Override
protected void initPathfinder() {
this.goalSelector.a(0, new PathfinderGoalFloat(this));
@@ -745,7 +745,7 @@ index 11a612fa390cb0acf37fb84c5d5b6ea926dabad3..a16ecd7edcd0ed081fff254d1f1429b3
//this.goalSelector.a(1, new PathfinderGoalPanic(this, 1.4D)); // Purpur - moved down
this.goalSelector.a(2, new PathfinderGoalBreed(this, 1.0D));
this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, EntityChicken.bv));
@@ -41,6 +52,7 @@ public class EntityChicken extends EntityAnimal {
@@ -39,6 +50,7 @@ public class EntityChicken extends EntityAnimal {
// Purpur start
if (world.purpurConfig.chickenRetaliate) {
this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, false));
@@ -1770,7 +1770,7 @@ index a67611c4f9271c116a795ee598412f25396fee88..216506a7b1f97b776ecd4e24f5b2afaf
if (this.j-- <= 0) {
this.j += this.i.getRandom().nextInt(5) + 2;
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index cf899bb6a5bd9d913ea90facdd5f3cc0dda1e9d2..93fcf801aa7a34ba8b4b72d87c2e093cbcef97b8 100644
index 565c938d879940d8e12fe320ea8524d2cf679c1f..5e99767f45f7ba7db80f5b51810689e059b5cef5 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -11,16 +11,28 @@ public class EntityGiantZombie extends EntityMonster {
@@ -2163,7 +2163,7 @@ index 96662fce02193496b4d91578d355932493d8e31e..9963cef9298eb6d3e2ee6a24d9b1998e
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
index a9dcf6875efda502d174c74bd17026a5c8f0fdcb..44c006bb10f36aff90cb07516d40a1b0d9bd24f5 100644
index c57bf5091430709778dc21d70c8a32819c9d6639..b0a5c36d1132e2558a1fefbd9f8dd26448400086 100644
--- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
+++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java
@@ -20,6 +20,16 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -2181,9 +2181,9 @@ index a9dcf6875efda502d174c74bd17026a5c8f0fdcb..44c006bb10f36aff90cb07516d40a1b0
+ }
+
@Override
protected void initAttributes(World world) {
if (world != null) {
@@ -35,6 +45,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
protected void initAttributes() {
this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(this.world.purpurConfig.illusionerMovementSpeed);
@@ -32,6 +42,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
protected void initPathfinder() {
super.initPathfinder();
this.goalSelector.a(0, new PathfinderGoalFloat(this));
@@ -2191,7 +2191,7 @@ index a9dcf6875efda502d174c74bd17026a5c8f0fdcb..44c006bb10f36aff90cb07516d40a1b0
this.goalSelector.a(1, new EntityIllagerWizard.b());
this.goalSelector.a(4, new EntityIllagerIllusioner.b());
this.goalSelector.a(5, new EntityIllagerIllusioner.a());
@@ -42,6 +53,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
@@ -39,6 +50,7 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan
this.goalSelector.a(8, new PathfinderGoalRandomStroll(this, 0.6D));
this.goalSelector.a(9, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 3.0F, 1.0F));
this.goalSelector.a(10, new PathfinderGoalLookAtPlayer(this, EntityInsentient.class, 8.0F));
@@ -2200,7 +2200,7 @@ index a9dcf6875efda502d174c74bd17026a5c8f0fdcb..44c006bb10f36aff90cb07516d40a1b0
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1d5d87e61946c674f61541455cf54018bfca1ecb..80589799ab08228d9e49afdf4570fa781092e5c5 100644
index 9c7d2d312549548003f2b6c534cc7a68e3946a84..ace2bb69fcde9af2a1691a25ae945bfe44ce117b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2256,7 +2256,7 @@ index 1d5d87e61946c674f61541455cf54018bfca1ecb..80589799ab08228d9e49afdf4570fa78
public void v(float f) {
this.aR = f;
}
@@ -1250,7 +1253,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1248,7 +1251,7 @@ public abstract class EntityInsentient extends EntityLiving {
protected void a(EntityHuman entityhuman, EntityInsentient entityinsentient) {}
protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2265,7 +2265,7 @@ index 1d5d87e61946c674f61541455cf54018bfca1ecb..80589799ab08228d9e49afdf4570fa78
}
public boolean ev() {
@@ -1622,4 +1625,54 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1620,4 +1623,54 @@ public abstract class EntityInsentient extends EntityLiving {
this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
this.unleash(true, false);
}
@@ -2372,10 +2372,10 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e37f37412b6bc24fa7a64823c30bd697731294d9..84e37e38026e1fd5ec626c7c8b81972cd5ed2ea4 100644
index 64580ce8dc1d0be61615a47c2fb3a6b0fecc93e6..418744b166571973a02dd6a31f0cc08376980076 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -459,7 +459,7 @@ public abstract class EntityLiving extends Entity {
@@ -462,7 +462,7 @@ public abstract class EntityLiving extends Entity {
@Override
public boolean bt() {
@@ -2384,7 +2384,7 @@ index e37f37412b6bc24fa7a64823c30bd697731294d9..84e37e38026e1fd5ec626c7c8b81972c
}
protected void cU() {
@@ -2191,7 +2191,7 @@ public abstract class EntityLiving extends Entity {
@@ -2194,7 +2194,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F * this.getBlockJumpFactor();
}
@@ -2393,7 +2393,7 @@ index e37f37412b6bc24fa7a64823c30bd697731294d9..84e37e38026e1fd5ec626c7c8b81972c
float f = this.dJ();
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2440,10 +2440,12 @@ public abstract class EntityLiving extends Entity {
@@ -2443,10 +2443,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.dN() * (0.21600002F / (f * f * f)) : this.aE;
}
@@ -2406,7 +2406,7 @@ index e37f37412b6bc24fa7a64823c30bd697731294d9..84e37e38026e1fd5ec626c7c8b81972c
public void q(float f) {
this.bu = f;
}
@@ -2843,6 +2845,20 @@ public abstract class EntityLiving extends Entity {
@@ -2846,6 +2848,20 @@ public abstract class EntityLiving extends Entity {
}
}
// Purpur end