mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: de5b093c Handle chunk unloading during block tick be7b4063 performance: Improve Activation Range entity iteration bacbd880 performance: Many Entity Activation Range Improvements 269394fe Update hidden-configs
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From f9bf73e2ad4c39eaba2194e3d0f70456d06cebe8 Mon Sep 17 00:00:00 2001
|
||||
From 87993a8d2eb4fc82971127f1252c7abebeff1ee4 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Sat, 4 May 2019 01:10:30 -0500
|
||||
Subject: [PATCH] Cows eat mushrooms
|
||||
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
|
||||
4 files changed, 77 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 0b9112c1b4..f81ab954e2 100644
|
||||
index 6e05cd094..765da25e6 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1038,6 +1038,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -1039,6 +1039,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ index 0b9112c1b4..f81ab954e2 100644
|
||||
public void a(SoundEffect soundeffect, float f, float f1) {
|
||||
if (!this.isSilent()) {
|
||||
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
|
||||
@@ -2577,6 +2578,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -2578,6 +2579,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
this.invulnerable = flag;
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ index 0b9112c1b4..f81ab954e2 100644
|
||||
this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch);
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
index 723a9fa1ee..f56fd7c012 100644
|
||||
index 723a9fa1e..f56fd7c01 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityCow.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityCow.java
|
||||
@@ -34,6 +34,7 @@ public class EntityCow extends EntityAnimal {
|
||||
@@ -124,7 +124,7 @@ index 723a9fa1ee..f56fd7c012 100644
|
||||
public EntityCow createChild(EntityAgeable entityageable) {
|
||||
return (EntityCow) EntityTypes.COW.a(this.world);
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 4049ab0273..47b19b7754 100644
|
||||
index 77fe338a8..592ccb81b 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2812,8 +2812,9 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -140,7 +140,7 @@ index 4049ab0273..47b19b7754 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 8ecf47f25a..d160efa0fe 100644
|
||||
index 8ecf47f25..d160efa0f 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -145,10 +145,12 @@ public class PurpurWorldConfig {
|
||||
|
||||
Reference in New Issue
Block a user