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

Updated Upstream (Paper)

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

Paper Changes:
dccaf59a MC-197883: Bandaid decode issue
99a1e58f Merge branch 'master' into progress/1.16.2
7470c3ef Do not let the server load chunks from newer versions (1.16.2+)
ecbc5ca0 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-08-21 20:23:12 -05:00
parent 5630d9a693
commit 1af3ae4877
7 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0126-Ridables.patch
View File

@@ -995,7 +995,7 @@ index 013639cc9..3ddfb5f34 100644
}
// Paper end
diff --git a/src/main/java/net/minecraft/server/EntityDolphin.java b/src/main/java/net/minecraft/server/EntityDolphin.java
index 0f51dbf8d..09a3a00e3 100644
index cde5c46fe..306454060 100644
--- a/src/main/java/net/minecraft/server/EntityDolphin.java
+++ b/src/main/java/net/minecraft/server/EntityDolphin.java
@@ -17,6 +17,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -1077,7 +1077,7 @@ index 0f51dbf8d..09a3a00e3 100644
}
@Override
@@ -194,6 +236,9 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -195,6 +237,9 @@ public class EntityDolphin extends EntityWaterAnimal {
@Override
public void tick() {
super.tick();
@@ -1087,7 +1087,7 @@ index 0f51dbf8d..09a3a00e3 100644
if (this.isNoAI()) {
this.setAirTicks(this.bG());
} else {
@@ -467,7 +512,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -468,7 +513,7 @@ public class EntityDolphin extends EntityWaterAnimal {
private int b;
@@ -1096,7 +1096,7 @@ index 0f51dbf8d..09a3a00e3 100644
@Override
public boolean a() {
@@ -535,7 +580,7 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -536,7 +581,7 @@ public class EntityDolphin extends EntityWaterAnimal {
}
}
@@ -1105,7 +1105,7 @@ index 0f51dbf8d..09a3a00e3 100644
private final EntityDolphin i;
@@ -545,7 +590,20 @@ public class EntityDolphin extends EntityWaterAnimal {
@@ -546,7 +591,20 @@ public class EntityDolphin extends EntityWaterAnimal {
}
@Override
@@ -1571,7 +1571,7 @@ index 08372b722..6a8e15f01 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index f47a78e56..a3447a530 100644
index 04b2bbea0..a73335e36 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -55,6 +55,39 @@ public class EntityFox extends EntityAnimal {
@@ -1638,7 +1638,7 @@ index f47a78e56..a3447a530 100644
private void m(ItemStack itemstack) {
if (!itemstack.isEmpty() && !this.world.isClientSide) {
EntityItem entityitem = new EntityItem(this.world, this.locX() + this.getLookDirection().x, this.locY() + 1.0D, this.locZ() + this.getLookDirection().z, itemstack);
@@ -480,6 +516,7 @@ public class EntityFox extends EntityAnimal {
@@ -481,6 +517,7 @@ public class EntityFox extends EntityAnimal {
return this.t(16);
}
@@ -1646,7 +1646,7 @@ index f47a78e56..a3447a530 100644
public void u(boolean flag) {
this.d(16, flag);
}
@@ -522,6 +559,7 @@ public class EntityFox extends EntityAnimal {
@@ -523,6 +560,7 @@ public class EntityFox extends EntityAnimal {
this.setSleeping(false);
}
@@ -1654,7 +1654,7 @@ index f47a78e56..a3447a530 100644
private void fd() {
this.w(false);
this.setCrouching(false);
@@ -687,16 +725,16 @@ public class EntityFox extends EntityAnimal {
@@ -688,16 +726,16 @@ public class EntityFox extends EntityAnimal {
}
}
@@ -1674,7 +1674,7 @@ index f47a78e56..a3447a530 100644
}
}
@@ -1366,16 +1404,16 @@ public class EntityFox extends EntityAnimal {
@@ -1367,16 +1405,16 @@ public class EntityFox extends EntityAnimal {
}
}