Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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

18
patches/server/0093-Configurable-jockey-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable jockey options
diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
index e6425bdf1..6fc8d1213 100644
index e6425bdf1a..6fc8d1213a 100644
--- a/src/main/java/net/minecraft/server/EntityDrowned.java
+++ b/src/main/java/net/minecraft/server/EntityDrowned.java
@@ -19,6 +19,23 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {
@@ -33,7 +33,7 @@ index e6425bdf1..6fc8d1213 100644
protected void m() {
this.goalSelector.a(1, new EntityDrowned.c(this, 1.0D));
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
index a69c3897c..fdd13b2ba 100644
index a69c3897c2..fdd13b2ba6 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -21,6 +21,23 @@ public class EntityPigZombie extends EntityZombie implements IEntityAngerable {
@@ -61,7 +61,7 @@ index a69c3897c..fdd13b2ba 100644
public void setAngerTarget(@Nullable UUID uuid) {
this.by = uuid;
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
index 00b89746f..9f117b20e 100644
index 661111e502..d8fb6afa6a 100644
--- a/src/main/java/net/minecraft/server/EntityZombie.java
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -93,7 +93,7 @@ index 00b89746f..9f117b20e 100644
@Override
protected void initPathfinder() {
if (world.purpurConfig.zombieTargetTurtleEggs) this.goalSelector.a(4, new EntityZombie.a(this, 1.0D, 3)); // Purpur
@@ -460,19 +475,20 @@ public class EntityZombie extends EntityMonster {
@@ -459,19 +474,20 @@ public class EntityZombie extends EntityMonster {
if (object instanceof EntityZombie.GroupDataZombie) {
EntityZombie.GroupDataZombie entityzombie_groupdatazombie = (EntityZombie.GroupDataZombie) object;
@@ -120,7 +120,7 @@ index 00b89746f..9f117b20e 100644
EntityChicken entitychicken1 = (EntityChicken) EntityTypes.CHICKEN.a(this.world);
entitychicken1.setPositionRotation(this.locX(), this.locY(), this.locZ(), this.yaw, 0.0F);
@@ -480,6 +496,7 @@ public class EntityZombie extends EntityMonster {
@@ -479,6 +495,7 @@ public class EntityZombie extends EntityMonster {
entitychicken1.setChickenJockey(true);
this.startRiding(entitychicken1);
generatoraccess.addEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
@@ -128,7 +128,7 @@ index 00b89746f..9f117b20e 100644
}
}
}
@@ -582,7 +599,7 @@ public class EntityZombie extends EntityMonster {
@@ -581,7 +598,7 @@ public class EntityZombie extends EntityMonster {
public static class GroupDataZombie implements GroupDataEntity {
@@ -138,7 +138,7 @@ index 00b89746f..9f117b20e 100644
public GroupDataZombie(boolean flag, boolean flag1) {
diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
index 143b9123e..2daff8562 100644
index 143b9123e0..2daff85620 100644
--- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
+++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
@@ -8,6 +8,23 @@ public class EntityZombieHusk extends EntityZombie {
@@ -166,7 +166,7 @@ index 143b9123e..2daff8562 100644
return c(entitytypes, generatoraccess, enummobspawn, blockposition, random) && (enummobspawn == EnumMobSpawn.SPAWNER || generatoraccess.f(blockposition));
}
diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
index 9b920332b..cd796f5b8 100644
index 9b920332bd..cd796f5b86 100644
--- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
+++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
@@ -27,6 +27,23 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo
@@ -194,7 +194,7 @@ index 9b920332b..cd796f5b8 100644
protected void initDatawatcher() {
super.initDatawatcher();
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 9de724686..3e067c832 100644
index 9de7246862..3e067c832f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -258,6 +258,15 @@ public class PurpurWorldConfig {