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

Don't apply potion effects on load either

Browse Source
This commit is contained in:
jmp
2020-12-12 03:31:45 -08:00
parent bbe5a58267
commit 5e2d6977ca
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0159-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -19,7 +19,7 @@ index f730fa484..e3ac6ebfd 100644
if (enumhand == EnumHand.MAIN_HAND) { if (enumhand == EnumHand.MAIN_HAND) {
this.setSlot(EnumItemSlot.MAINHAND, itemstack); this.setSlot(EnumItemSlot.MAINHAND, itemstack);
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index 6c25f667e..b28f1a374 100644 index 6c25f667e..5fe2e9f4b 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java --- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -14,11 +14,42 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -14,11 +14,42 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
@@ -129,15 +129,18 @@ index 6c25f667e..b28f1a374 100644
this.c(nbttagcompound); this.c(nbttagcompound);
} }
@@ -128,6 +192,7 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -128,6 +192,10 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
if (nbttagcompound.hasKeyOfType("CollarColor", 99)) { if (nbttagcompound.hasKeyOfType("CollarColor", 99)) {
this.setCollarColor(EnumColor.fromColorIndex(nbttagcompound.getInt("CollarColor"))); this.setCollarColor(EnumColor.fromColorIndex(nbttagcompound.getInt("CollarColor")));
} }
+ setRabid(nbttagcompound.getBoolean("Purpur.IsRabid")); // Purpur + // Purpur start
+ this.isRabid = nbttagcompound.getBoolean("Purpur.IsRabid");
+ this.updatePathfinders(false);
+ // Purpur end
this.a((WorldServer) this.world, nbttagcompound); this.a((WorldServer) this.world, nbttagcompound);
} }
@@ -172,6 +237,11 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -172,6 +240,11 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
public void tick() { public void tick() {
super.tick(); super.tick();
if (this.isAlive()) { if (this.isAlive()) {
@@ -149,7 +152,7 @@ index 6c25f667e..b28f1a374 100644
this.bv = this.bu; this.bv = this.bu;
if (this.eY()) { if (this.eY()) {
this.bu += (1.0F - this.bu) * 0.4F; this.bu += (1.0F - this.bu) * 0.4F;
@@ -343,6 +413,20 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable @@ -343,6 +416,20 @@ public class EntityWolf extends EntityTameableAnimal implements IEntityAngerable
return EnumInteractionResult.SUCCESS; return EnumInteractionResult.SUCCESS;
} }