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

Updated Upstream (Paper)

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

Paper Changes:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0111-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d42784775fb1626e 100644
index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963d7a9193f 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
@@ -243,7 +243,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2535,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2537,6 +2552,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2757,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2759,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public void n(float f) {}
public boolean bL() {
@@ -3191,6 +3208,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3193,6 +3210,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3643,4 +3672,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3645,4 +3674,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -2143,10 +2143,10 @@ index 0e98173607c810e0e74552a2ba8febf292357c39..559ba50977147b8e2a0e7c1e7dc281fa
+ protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 75f98741153cf63cbb6b9abfabed0451277ba801..deb6c93426e35c47fbe23dba71bd1712f4dba652 100644
index 96662fce02193496b4d91578d355932493d8e31e..9963cef9298eb6d3e2ee6a24d9b1998e765123ac 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2148,4 +2148,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2155,4 +2155,15 @@ public abstract class EntityHuman extends EntityLiving {
return this.g;
}
}
@@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
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 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b77866472798 100644
index 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f395ac2cb3 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -459,7 +459,7 @@ public abstract class EntityLiving extends Entity {
@@ -2384,7 +2384,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
}
protected void cU() {
@@ -2179,7 +2179,7 @@ public abstract class EntityLiving extends Entity {
@@ -2185,7 +2185,7 @@ public abstract class EntityLiving extends Entity {
return 0.42F * this.getBlockJumpFactor();
}
@@ -2393,7 +2393,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
float f = this.dJ();
if (this.hasEffect(MobEffects.JUMP)) {
@@ -2428,10 +2428,12 @@ public abstract class EntityLiving extends Entity {
@@ -2434,10 +2434,12 @@ public abstract class EntityLiving extends Entity {
return this.onGround ? this.dN() * (0.21600002F / (f * f * f)) : this.aE;
}
@@ -2406,7 +2406,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
public void q(float f) {
this.bu = f;
}
@@ -2831,6 +2833,20 @@ public abstract class EntityLiving extends Entity {
@@ -2837,6 +2839,20 @@ public abstract class EntityLiving extends Entity {
}
}
// Purpur end
@@ -6352,10 +6352,10 @@ index 0000000000000000000000000000000000000000..3059078c37deb35fcd20e27767f9b795
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1fe253bc7261a6077747addf8d9023ca94525999..bf387664c2f509ff047b2cbaa3d6619a0718f5e9 100644
index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f1d28638b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1159,4 +1159,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1160,4 +1160,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return getHandle().isTicking();
}
// Paper end