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

Rebuild patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-11-01 14:56:28 -06:00
parent 2f7a0a0f97
commit 3fec5dae98
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0130-Persistent-TileEntity-Lore-and-DisplayName.patch → patches/server/0131-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -7,7 +7,7 @@ Makes it so that when a TileEntity is placed in the world and then broken,
the dropped ItemStack retains any original custom display name/lore.
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 4aa2b38f1..f86390999 100644
index 4aa2b38f18..f863909992 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -207,6 +207,7 @@ public class Block extends BlockBase implements IMaterial {
@@ -74,7 +74,7 @@ index 4aa2b38f1..f86390999 100644
public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index bbb1de7d1..d97efe3d4 100644
index bbb1de7d1a..d97efe3d47 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -96,7 +96,24 @@ public class ItemBlock extends Item {
@@ -104,7 +104,7 @@ index bbb1de7d1..d97efe3d4 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 58d958a88..8e8749095 100644
index 58d958a88a..8e87490954 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -90,9 +90,25 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -160,7 +160,7 @@ index 58d958a88..8e8749095 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b769a54fc..400766dc7 100644
index 14c1e0d1f9..3aa8f34ecc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -184,6 +184,7 @@ public class PurpurWorldConfig {

0
patches/server/0131-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch → patches/server/0132-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
View File

4
patches/server/0132-Flying-squids-Oh-my.patch → patches/server/0133-Flying-squids-Oh-my.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying squids! Oh my!
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
index c9d246131..aa294a46e 100644
index 8c749c50bf..7526a18c53 100644
--- a/src/main/java/net/minecraft/server/EntitySquid.java
+++ b/src/main/java/net/minecraft/server/EntitySquid.java
@@ -51,6 +51,11 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -38,7 +38,7 @@ index c9d246131..aa294a46e 100644
float f1 = MathHelper.cos(f) * 0.2F;
float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3aa8f34ec..4678b19e3 100644
index 3aa8f34ecc..4678b19e30 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -865,10 +865,12 @@ public class PurpurWorldConfig {

2
patches/server/0133-Infinity-bow-settings.patch → patches/server/0134-Infinity-bow-settings.patch
View File

@@ -26,7 +26,7 @@ index dd6a93dc78..8241f3dafa 100644
entityhuman.b(StatisticList.ITEM_USED.b(this));
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f063a1a8c7..95d54148ca 100644
index 4678b19e30..31e803b268 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -147,6 +147,15 @@ public class PurpurWorldConfig {

4
patches/server/0134-Stonecutter-damage.patch → patches/server/0135-Stonecutter-damage.patch
View File

@@ -26,7 +26,7 @@ index 3e57abd33e..08ba9e1c4e 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
index 9caf6598f8..dbd352bd3f 100644
index 7341b5afd3..c708a15498 100644
--- a/src/main/java/net/minecraft/server/PathfinderNormal.java
+++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -467,7 +467,7 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -39,7 +39,7 @@ index 9caf6598f8..dbd352bd3f 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 95d54148ca..3c1bd31b92 100644
index 31e803b268..fd07c9f213 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -377,6 +377,11 @@ public class PurpurWorldConfig {

2
patches/server/0135-Configurable-daylight-cycle.patch → patches/server/0136-Configurable-daylight-cycle.patch
View File

@@ -74,7 +74,7 @@ index 0fb41962c8..86b6442292 100644
public void doMobSpawning(boolean flag, boolean flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3c1bd31b92..8f94b05373 100644
index fd07c9f213..3f7c2d7e23 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -116,6 +116,13 @@ public class PurpurWorldConfig {

4
patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch → patches/server/0137-Allow-infinite-and-mending-enchantments-together.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow infinite and mending enchantments together
diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
index 408cfa460..3d4e34f70 100644
index 408cfa4609..3d4e34f707 100644
--- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
+++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java
@@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment {
@@ -17,7 +17,7 @@ index 408cfa460..3d4e34f70 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d33d24af6..418fc8390 100644
index b5d5a259fd..6cfc1094b6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -55,8 +55,8 @@ public class PurpurConfig {

4
patches/server/0137-Infinite-fuel-furnace.patch → patches/server/0138-Infinite-fuel-furnace.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 1d3c2dd93..e96fc0420 100644
index 1d3c2dd936..e96fc0420a 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -266,6 +266,16 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -26,7 +26,7 @@ index 1d3c2dd93..e96fc0420 100644
if (!this.isBurning() && this.cookTime > 0) {
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 8f94b0537..71957fe45 100644
index 3f7c2d7e23..2c26c4df22 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -344,6 +344,11 @@ public class PurpurWorldConfig {