From b0bdfa48ac2b827138d3e3a4d779570583d25b60 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 22 Jun 2021 09:52:42 -0500 Subject: [PATCH] Update Upstream (Paper) yadda yadda.. I haven't added a task to detect Paper's commits yet, and i dont feel like doing this manually.. so yeah. if you care, just look at paper's github history :P --- gradle.properties | 2 +- patches/server/0001-Rebrand.patch | 6 +++--- patches/server/0002-Purpur-config-files.patch | 8 ++++---- patches/server/0003-Ridables.patch | 14 +++++++------- .../server/0065-Add-canSaveToDisk-to-Entity.patch | 4 ++-- ...0098-Stop-squids-floating-on-top-of-water.patch | 4 ++-- ...01-Entities-can-use-portals-configuration.patch | 6 +++--- patches/server/0142-Implement-TPSBar.patch | 6 +++--- patches/server/0147-Add-MC-4-fix-back.patch | 4 ++-- patches/server/0154-Fix-stuck-in-portals.patch | 4 ++-- patches/server/0175-Drowning-Settings.patch | 8 ++++---- .../0205-API-for-any-mob-to-burn-daylight.patch | 6 +++--- ...dd-toggle-for-end-portal-safe-teleporting.patch | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/gradle.properties b/gradle.properties index eb8b62c79..899c9ead6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version=1.17-R0.1-SNAPSHOT mcVersion=1.17 packageVersion=1_17_R1 -paperCommit=40e27befc2e04a58c63b293b04ccbeea085c9dfb +paperCommit=f110140f967f9e6bfc64eff45ef25a37c593bb1c org.gradle.parallel=true org.gradle.vfs.watch=false diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 53852bd65..6cb78e15d 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -76,7 +76,7 @@ index a1d5c0f8fe2adb2ee56f3217e089211ec7c61eb0..43a88bc58716eef4040584944f52893c if (outputStream != null) { try { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e..736a7baab17b26319f2aa39ad059e2f5a7ee16cf 100644 +index a24bab6095b85fe208bb0f467b267a9d0680c6fc..4690a1c926dd695c98ac8012f271e1a71a0d3d6d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b3312fa2fd218ffcfaa61d98584003c97fbda4ce..f0b9ff60b6122473bc2f87f56a6d190994079da6 100644 +index 14bea212adbfa341ca6080a01f87b51891808d2a..56ec19abc2fa4b63eb93e1ca54c3b3c4c36ba88c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -201,6 +201,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -86,7 +86,7 @@ index 0c295854f31422cf3ad699d229805c5881a65eed..359f8a37e625af463f898f72b8c30ff4 if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9ec55832877773131333f45899af42ac9411f0cd..a79485e95a09c8f14b2de53d3904376c45ae0a5c 100644 +index d708e210dc605ce4dca845292532dd17db383b40..12f70017216f737dff2b7ee815290609babb38cc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -107,7 +107,7 @@ index 9ec55832877773131333f45899af42ac9411f0cd..a79485e95a09c8f14b2de53d3904376c private float eyeHeight; public boolean isInPowderSnow; public boolean wasInPowderSnow; -@@ -2409,6 +2409,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2412,6 +2412,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.passengers = ImmutableList.copyOf(list); } @@ -120,7 +120,7 @@ index 9ec55832877773131333f45899af42ac9411f0cd..a79485e95a09c8f14b2de53d3904376c } return true; // CraftBukkit } -@@ -2449,6 +2455,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2452,6 +2458,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return false; } // Spigot end @@ -135,7 +135,7 @@ index 9ec55832877773131333f45899af42ac9411f0cd..a79485e95a09c8f14b2de53d3904376c if (this.passengers.size() == 1 && this.passengers.get(0) == entity) { this.passengers = ImmutableList.of(); } else { -@@ -4015,4 +4029,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4018,4 +4032,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end @@ -1026,7 +1026,7 @@ index f3093815066e6881a2bb638ae4643f69374450b3..2300abc4e80449e6b92992f6fb8cfe8e this.setAirSupply(this.getMaxAirSupply()); } else { diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java -index 31f4e4a93ea5fd3ffe7e60dff2e2a9642b51daa2..6cc8f6ef75e4b8b4282e4f664a83ce6491042df1 100644 +index 21274d2c8c78d8454dbfc19076a52e54876bd78d..ee9dfc609cc9e4a94dca7803e51bb456c1e63389 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java @@ -138,6 +138,39 @@ public class Fox extends Animal { diff --git a/patches/server/0065-Add-canSaveToDisk-to-Entity.patch b/patches/server/0065-Add-canSaveToDisk-to-Entity.patch index 53ccd04d3..a9afcfd48 100644 --- a/patches/server/0065-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0065-Add-canSaveToDisk-to-Entity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aa3a7ffe65b5fef1977b42918a3b8e7a6f2a55ec..f3a979712e89cb11968a3f25f8001e6d1ceba4f0 100644 +index 9e65dc4306baa149669a82c1840f16cf1ce6d796..7b92f2ae2799af2713088e655da0716c10f52189 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4066,5 +4066,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4069,5 +4069,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public boolean processClick(InteractionHand hand) { return false; } diff --git a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch index d1ef7d4fa..e9b926d05 100644 --- a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f3a979712e89cb11968a3f25f8001e6d1ceba4f0..a2c060948f99739664f4c3c4657ca628378fa5c6 100644 +index 7b92f2ae2799af2713088e655da0716c10f52189..d774fd1c2f146b9933f7f1d4d4cdda1aeea5bf44 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3640,11 +3640,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3643,11 +3643,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.yRotO = this.getYRot(); } diff --git a/patches/server/0101-Entities-can-use-portals-configuration.patch b/patches/server/0101-Entities-can-use-portals-configuration.patch index f2fb8f6fd..11b04fd95 100644 --- a/patches/server/0101-Entities-can-use-portals-configuration.patch +++ b/patches/server/0101-Entities-can-use-portals-configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a2c060948f99739664f4c3c4657ca628378fa5c6..c443b850a512eae94d451521c5e9e0342aca2171 100644 +index d774fd1c2f146b9933f7f1d4d4cdda1aeea5bf44..0f8cafed9afbb801217b2adb91c270811e149913 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2509,7 +2509,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2512,7 +2512,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public void handleInsidePortal(BlockPos pos) { if (this.isOnPortalCooldown()) { this.setPortalCooldown(); @@ -17,7 +17,7 @@ index a2c060948f99739664f4c3c4657ca628378fa5c6..c443b850a512eae94d451521c5e9e034 if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) { this.portalEntrancePos = pos.immutable(); } -@@ -3141,7 +3141,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3144,7 +3144,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } public boolean canChangeDimensions() { diff --git a/patches/server/0142-Implement-TPSBar.patch b/patches/server/0142-Implement-TPSBar.patch index 7f446d74e..26dc990da 100644 --- a/patches/server/0142-Implement-TPSBar.patch +++ b/patches/server/0142-Implement-TPSBar.patch @@ -17,7 +17,7 @@ index f164106a957c24bdb71bde85d82948a64613fd91..bef1f6ca54fc6c1741b54b8e071a90eb if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 91e6d0b6560ffa8e870eca9707d5cd117fcb2347..d525bd371bedf75c24afd4a8a1240b31f91aa9da 100644 +index 814250f52c48af1ddc6e91cbf5519b331619d304..f82dcc723adf0157cb4122b1c9dc3e0bce55d0a3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1040,6 +1040,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b79c2436c6a89a344ed17fd02d798a63a2972389..5f39278e5115a817cbd123ce625a84e4d9b4a771 100644 +index 714749691ab1252aea682eb1222c76d307ae1fe7..28530a6b3b55d51f03df02a504900ccf83a11de7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4079,5 +4079,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4082,5 +4082,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public boolean canSaveToDisk() { return true; } @@ -29,7 +29,7 @@ index b79c2436c6a89a344ed17fd02d798a63a2972389..5f39278e5115a817cbd123ce625a84e4 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c7cbdd7becb53767cbd652719ebe88646df21220..05fad2a847868e224212369ebe2eeb0748c4c962 100644 +index 521a353a1de6573b7e4fcebc673494cdb93d7815..c4865a08e40205bd17697b039769fd8615b24744 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch index a42797778..cf57150be 100644 --- a/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0210-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5f39278e5115a817cbd123ce625a84e4d9b4a771..cab88e911866d28df7e8eeadc3262d97d775c637 100644 +index 28530a6b3b55d51f03df02a504900ccf83a11de7..51dbfb0aaa6f87ec86d00f88ab73df0f434bd32f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2557,7 +2557,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2560,7 +2560,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } this.processPortalCooldown(); @@ -45,7 +45,7 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182 entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e292708ce4a60b6a00280528d459e10fbb939c39..27eee8a098398d1d8ffa6d61559e53688dc2d57f 100644 +index 65578b3e8933c049e577b19da34509413ac9de37..a60b607a454ac56d3e66311444d3db0751c79668 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -621,6 +621,11 @@ public class PurpurWorldConfig {