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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9788250b1 Clean up a lot of obfuscation helpers and impls
58a745eba Fix scoreboard vanilla colors not working in chat
This commit is contained in:
William Blake Galbreath
2020-08-04 16:08:06 -05:00
parent 3bbbdfb092
commit 83d82e5cf3
15 changed files with 114 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0105-Ridables.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java
index ac6f9d9e52..d874b177b4 100644
index 6393ff765f..9515926b22 100644
--- a/src/main/java/net/minecraft/server/ControllerMove.java
+++ b/src/main/java/net/minecraft/server/ControllerMove.java
@@ -6,9 +6,9 @@ public class ControllerMove {
@@ -22,7 +22,7 @@ index ac6f9d9e52..d874b177b4 100644
public ControllerMove(EntityInsentient entityinsentient) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2d49816311..d14e4b1eef 100644
index ae26a83873..446ba7b232 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1126,7 +1126,7 @@ index 0e23aa91d5..892ba2e59a 100644
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 d447eb7960..4d56c97347 100644
index e276a59203..9cab9e43a6 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -67,8 +67,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1172,7 +1172,7 @@ index d447eb7960..4d56c97347 100644
}
public boolean ew() {
@@ -1591,4 +1595,45 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1589,4 +1593,45 @@ public abstract class EntityInsentient extends EntityLiving {
this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
this.unleash(true, false);
}
@@ -1270,7 +1270,7 @@ index ab0731c2a0..2da50ef495 100644
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 4a8dd3010e..ab64c04919 100644
index d11e3369d8..2e3c0250b8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -458,7 +458,7 @@ public abstract class EntityLiving extends Entity {
@@ -2425,7 +2425,7 @@ index 28adbbebd1..c0b5476ff7 100644
this.eM();
}
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 9f117b20e2..5189795ce6 100644
index d8fb6afa6a..9620368426 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -46,6 +46,16 @@ public class EntityZombie extends EntityMonster {