Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01: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:
8ccb7fd67 Add and implement cancellable TargetHitEvent for when Target Blocks are hit by Projectiles
0507b5d7f [Auto] Updated Upstream (CraftBukkit)
1c2571224 [CI-SKIP] [Auto] Rebuild Patches
2b312dfbe Add OBSTRUCTED result to BedEnterResult enum
a5201ac98 [CI-SKIP] [Auto] Rebuild Patches
fb7503399 added PlayerTradeEvent
This commit is contained in:
jmp
2020-12-29 11:49:13 -08:00
parent 77373ea42e
commit 7194a1684a
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -9671,10 +9671,10 @@ index 957a351c3f6c4f66d7af6657ab0c3cbeed94662f..57166a543a9af9e10e38c983487fac7e
this.setPersistent();
}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db 100644
index 6d716214e756fe1326cd3d2becea969076f6fd5b..fb1d640d89258477dd1286fff929deecffb69d9e 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -709,7 +709,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -710,7 +710,13 @@ public abstract class EntityInsentient extends EntityLiving {
if (this.world.getDifficulty() == EnumDifficulty.PEACEFUL && this.L()) {
this.die();
} else if (!this.isPersistent() && !this.isSpecialPersistence()) {
@@ -11947,7 +11947,7 @@ index 253377c6238594de1f76cafcbf8223592e4d3f6b..3ebe3d0dc4c2c6aee6ea349006a74cbe
if (entityliving == entityliving1) {
return false;
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 11a67ca18f566bfc214659e7fb454ea2b4d8a7ad..35a569f61ba2d48f3f9692927a23777bafcf26d6 100644
index 42b12ad5ba68bdf8f76704ddd970715770183de0..ac82f1791ce07e9a23cf97ca34974ab25e26be46 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -56,6 +56,12 @@ public class PlayerChunk {
@@ -11971,7 +11971,7 @@ index 11a67ca18f566bfc214659e7fb454ea2b4d8a7ad..35a569f61ba2d48f3f9692927a23777b
+ if (chunk != null && (blockposition.getY() >= 0 && blockposition.getY() <= 255)) { // Tuinity - updates cannot happen in sections that don't exist
byte b0 = (byte) SectionPosition.a(blockposition.getY());
if (b0 >= this.dirtyBlocks.length) return; // CraftBukkit - SPIGOT-6086
if (b0 < 0 || b0 >= this.dirtyBlocks.length) return; // CraftBukkit - SPIGOT-6086, SPIGOT-6296
@@ -377,13 +383,14 @@ public class PlayerChunk {
public void a(EnumSkyBlock enumskyblock, int i) {