Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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:
1daafe455 Updated Upstream (Bukkit/CraftBukkit)
98828b006 Merge pull request #4132 from Proximyst/progress/1.16.2
b23f27f8d  Fix incorrect return for WorldServer#addAllEntitiesSafely (#3)
5085fa30c Fix MC-187716 Use configured height
c44add5a0 Initialise a new chunk section if none was found yet updated
74a4d5f8b Remove armour stand double add to world
6d25cc4ec Don't mark null chunk sections for block updates
This commit is contained in:
William Blake Galbreath
2020-08-16 09:32:41 -05:00
parent 38c21107af
commit 6b4bc4775d
18 changed files with 184 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 40fad381e..db7ac28da 100644
index 305b63b295..b3a28d1b8d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1691,6 +1691,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1692,6 +1692,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -22,7 +22,7 @@ index 40fad381e..db7ac28da 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index eb32abc5d..6a505b3b0 100644
index eb32abc5d1..6a505b3b04 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -320,7 +320,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -35,7 +35,7 @@ index eb32abc5d..6a505b3b0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
index a726dd676..b84aa1db8 100644
index a726dd6768..b84aa1db83 100644
--- a/src/main/java/net/minecraft/server/EntityBat.java
+++ b/src/main/java/net/minecraft/server/EntityBat.java
@@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
@@ -48,7 +48,7 @@ index a726dd676..b84aa1db8 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
index 0f25d7cd6..5887b7a26 100644
index 0f25d7cd61..5887b7a26e 100644
--- a/src/main/java/net/minecraft/server/EntityBoat.java
+++ b/src/main/java/net/minecraft/server/EntityBoat.java
@@ -106,7 +106,7 @@ public class EntityBoat extends Entity {
@@ -61,7 +61,7 @@ index 0f25d7cd6..5887b7a26 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index da79c7e63..8cfbf8abf 100644
index da79c7e631..8cfbf8abf6 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -74,7 +74,7 @@ index da79c7e63..8cfbf8abf 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 51b2aa3e2..9398fa680 100644
index 51b2aa3e20..9398fa6801 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2854,7 +2854,7 @@ public abstract class EntityLiving extends Entity {
@@ -98,7 +98,7 @@ index 51b2aa3e2..9398fa680 100644
// CraftBukkit start - collidable API
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index d5e129678..5e64ca8a0 100644
index d5e129678d..5e64ca8a03 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -107,7 +107,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -111,7 +111,7 @@ index d5e129678..5e64ca8a0 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 34e08dda2..6bb73f869 100644
index 34e08dda2e..6bb73f869b 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java
+++ b/src/main/java/net/minecraft/server/EntityParrot.java
@@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -126,7 +126,7 @@ index 34e08dda2..6bb73f869 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 47f48d3b7..e524705bf 100644
index 65c241d88e..9b6e356bb3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1771,8 +1771,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -141,7 +141,7 @@ index 47f48d3b7..e524705bf 100644
// Purpur end
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 939535cb2..70eb26304 100644
index 939535cb22..70eb26304d 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -45,11 +45,17 @@ public final class IEntitySelector {
@@ -164,7 +164,7 @@ index 939535cb2..70eb26304 100644
} else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
return false;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a9b1a130b..860e25dfd 100644
index a9b1a130be..860e25dfd8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -114,6 +114,7 @@ public class PurpurWorldConfig {