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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit)
a23be44da [Auto] Updated Upstream (CraftBukkit)
e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945)
d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent
24388381a Fix lead duplication

Tuinity Changes:
09423b6 Update to Starlight 0.0.2-RC3
f06591a Update Upstream (Paper)
d2aa70f Revert special block lookup for chunksection
This commit is contained in:
BillyGalbreath
2020-12-28 01:21:49 -06:00
parent 7152b72d25
commit 3d455ff2d5
41 changed files with 2405 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 0bdfb01589...e4633ca277

4
patches/api/0007-AFK-API.patch
View File

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a23c08c48ec627147d94ab4bf4fdf4dae1edeaca..bf4699c405447d07e9a4b70522c7a7c944677f74 100644
index f7fd13dc6056817819c1dbffcaf19c25b95fe2c0..250b434af848546fa3a6ffd748f03a910095b33d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1925,4 +1925,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1933,4 +1933,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0018-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index bf4699c405447d07e9a4b70522c7a7c944677f74..18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8 100644
index 250b434af848546fa3a6ffd748f03a910095b33d..e398da35bef48b5846d8c66df75b1df11b43e382 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1945,5 +1945,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1953,5 +1953,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

6
patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -1015,7 +1015,7 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef4240d691fa 100644
index e398da35bef48b5846d8c66df75b1df11b43e382..8da3ce6d1ba6911cb1a4be2e425266bd4760c052 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1433,7 +1433,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1066,7 +1066,7 @@ index 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef42
*/
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
@@ -1774,6 +1768,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1782,6 +1776,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -1075,7 +1075,7 @@ index 18b5f84a1d7567e17d8baa9abb889a1f7cc7f5b8..721c6fbe5bdebf5e490af9956c2cef42
* @return the client option value of the player
*/
@NotNull
@@ -1794,6 +1790,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1802,6 +1798,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

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

File diff suppressed because it is too large Load Diff

10
patches/server/0009-AFK-API.patch
View File

@@ -25,10 +25,10 @@ index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c548410
super(EntityTypes.PLAYER, world);
this.bL = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 2c276971d47e48b39afa176994eba5747a3a3951..33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b 100644
index 72fcd7f259630cb3c194deb685a2c4498a7c7079..76d42805a4616da11c06b492590a9d52e979a4b7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1893,8 +1893,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1904,8 +1904,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.ca = SystemUtils.getMonotonicMillis();
@@ -193,10 +193,10 @@ index 37e9b8983fc310a04c98e27048b119439179cb5f..d42dbc3b44f8b54b05f356155727f5a8
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 800471d450ddcb8d291dc72e93c3d8251cc63248..04578acc532849ef7c93a3515841aa05d9f7fee6 100644
index 8d8385e3022dd84e2b92daeffa190dbda60c705b..04241410edd97bdce876a61052bd94189168d367 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -834,7 +834,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -774,7 +774,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// CraftBukkit end
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -205,7 +205,7 @@ index 800471d450ddcb8d291dc72e93c3d8251cc63248..04578acc532849ef7c93a3515841aa05
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1171,7 +1171,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1111,7 +1111,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();

2
patches/server/0012-LivingEntity-safeFallDistance.patch
View File

@@ -30,7 +30,7 @@ index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 9737c8b31482de140e14e58aa9baa8618d1c3fb4..e98e0ca17dbb683fad97be6b9f226e1ce579431f 100644
index 1c396ec56f35d8764e3bf7b67a7984393eb94b3b..94585029142f8d8c494cf957d5363a0aec0b697d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0017-EntityMoveEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index e98e0ca17dbb683fad97be6b9f226e1ce579431f..4bbfb21d13c7e2f3ffcaaa31bd9ceee3755aa7cc 100644
index 94585029142f8d8c494cf957d5363a0aec0b697d..144c443f6f8b7ab2c6df2d32c27ef8bed21ce9dd 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {
@@ -42,7 +42,7 @@ index 5d8cf545acf231f8f9c037db26f4d29bc01efabb..fe3b76e4ed11f0183731a0dcc39a323c
this.methodProfiler.a(() -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 04578acc532849ef7c93a3515841aa05d9f7fee6..b8e788eb66575051073ec2230e8b71dbd59d5b71 100644
index 04241410edd97bdce876a61052bd94189168d367..b36baf63f5981309020b3b24b907d097188b4487 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -101,6 +101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

10
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2916cd7d2 100644
index 76d42805a4616da11c06b492590a9d52e979a4b7..77603a4819c02d73d4b058a8a3d822ae6a4cb505 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -980,6 +982,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -991,6 +993,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -987,7 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -998,7 +1006,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -39,7 +39,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -1158,6 +1166,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1169,6 +1177,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2
return this;
}
}
@@ -2311,9 +2320,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2322,9 +2331,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public

4
patches/server/0027-Giants-AI-settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d93db1049ef9421f6b3edd0dc52a421c4d1b51c2..0502ba688d3d16f15fea1ddda1f7d0bcbe59d701 100644
index d43a843be591da1b34b37dc95d7d82549d9f56f4..8e2bc7237463647b41e6451deb1679380a5b33f1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -118,7 +118,7 @@ index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..fba53ad6792236f0282279283570ffbd
float f = difficultydamagescaler.d();
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4bbfb21d13c7e2f3ffcaaa31bd9ceee3755aa7cc..1fa5edd4dfbbe5cc68856a32b01a0c8ea83e3f6f 100644
index 144c443f6f8b7ab2c6df2d32c27ef8bed21ce9dd..01c37b61a5f848588025540a20762954ea2695a5 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -165,6 +165,7 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0029-Zombie-horse-naturally-spawn.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b8e788eb66575051073ec2230e8b71dbd59d5b71..9469d6052ad920f9fd9848e7ee55e488372e5e62 100644
index b36baf63f5981309020b3b24b907d097188b4487..f288bf3f6e521cfde14b08c62d591ad74d2e3153 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1049,12 +1049,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -989,12 +989,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {

4
patches/server/0039-Cat-spawning-options.patch
View File

@@ -95,10 +95,10 @@ index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9469d6052ad920f9fd9848e7ee55e488372e5e62..e26fc1a6032027d16e72931c8329196b683774ba 100644
index f288bf3f6e521cfde14b08c62d591ad74d2e3153..93f09acd2ca26793bc0771a6cc5419bfa8536816 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2559,6 +2559,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2499,6 +2499,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}

6
patches/server/0041-Cows-eat-mushrooms.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0502ba688d3d16f15fea1ddda1f7d0bcbe59d701..bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f 100644
index 8e2bc7237463647b41e6451deb1679380a5b33f1..3d1c3232632e49ae2d7a22c9a48545540200efa0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2775,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2786,6 +2786,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -110,7 +110,7 @@ index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aa
public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a((World) worldserver);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1fa5edd4dfbbe5cc68856a32b01a0c8ea83e3f6f..f7bdd5f2a35c0abc018732d7fd920b162cb0a2d1 100644
index 01c37b61a5f848588025540a20762954ea2695a5..5ab1121c99c67662ce659428be46f2189f7e2d04 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0048-Signs-allow-color-codes.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0bcbad5612b21fab158bfe5aa124d7a2916cd7d2..6323b3661a04de3206d0ac762599a3f5709a00ff 100644
index 77603a4819c02d73d4b058a8a3d822ae6a4cb505..da693a31f26973467b4494e79996c3f0d8a3a758 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1418,6 +1418,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1429,6 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {

6
patches/server/0050-Controllable-Minecarts.patch
View File

@@ -22,7 +22,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b8
super(i, j, k);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f7bdd5f2a35c0abc018732d7fd920b162cb0a2d1..15518abcc1ec5f9a56d1992c852d180c9937fc69 100644
index 5ab1121c99c67662ce659428be46f2189f7e2d04..802d5488876a4bebad18fbb6b2256c0259ba50c2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
@@ -106,10 +106,10 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e
this.move(EnumMoveType.SELF, this.getMot());
if (!this.onGround) {
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6323b3661a04de3206d0ac762599a3f5709a00ff..0ad636b88dfcd955621c1db56f73333300afcb88 100644
index da693a31f26973467b4494e79996c3f0d8a3a758..5bee05e6e8b52d1edea81a0d76ec9cfdb5acf704 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -993,6 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1004,6 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.isInvulnerable(damagesource)) {
return false;
} else {

2
patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 15518abcc1ec5f9a56d1992c852d180c9937fc69..39342dd0bb7d79167310d61b629718b150595614 100644
index 802d5488876a4bebad18fbb6b2256c0259ba50c2..737b812d3932de29233b26fe7a978b98b2c3cc8f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1493,8 +1493,10 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0052-Players-should-not-cram-to-death.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0ad636b88dfcd955621c1db56f73333300afcb88..65b95816f885129b83675161478ab19b4a7de8bc 100644
index 5bee05e6e8b52d1edea81a0d76ec9cfdb5acf704..36be65f9a36ea1b35ffa882eec295e1f46021f0c 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1395,7 +1395,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1406,7 +1406,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

6
patches/server/0055-Fix-the-dead-lagging-the-server.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc 100644
index 3d1c3232632e49ae2d7a22c9a48545540200efa0..cbdfc8d929f9419d49b0642e8cfc7219741e0e38 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1532,6 +1532,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
this.lastYaw = this.yaw;
this.lastPitch = this.pitch;
@@ -17,7 +17,7 @@ index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabf
public void f(double d0, double d1, double d2) {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 39342dd0bb7d79167310d61b629718b150595614..7bffafb7b2b6124b8ca1400e99fa5973e96793f2 100644
index 737b812d3932de29233b26fe7a978b98b2c3cc8f..435726651ada6ccb4bbd31fe21a439d29f131098 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2492,7 +2492,7 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0064-Villagers-follow-emerald-blocks.patch
View File

@@ -23,7 +23,7 @@ index 171e8553a339eb3c995369f274de86b824183ca6..0ab7d3441bcafae9874134c7832a4b7c
public BehaviorController<EntityVillager> getBehaviorController() {
return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index 1fddf7c77488a5e53fc48d0db0a7b8acc71e2f42..488a6891d83b9673b5f9590e14283c44c0015316 100644
index 8971dd013498e70c4e7a6ac6a218f62e599c86b9..3e912ef9cce8ded55564dbfe61329192922b2f13 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -14,6 +14,8 @@ import org.bukkit.event.entity.VillagerAcquireTradeEvent;

6
patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch
View File

@@ -23,10 +23,10 @@ index ae5ed3bd0b663092a4658b24cbd69d37b4e141cb..2452f54d96cab2d93140c64e25d9b799
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 64dd95292fb4d058f6200bfcadaedfbd62b2461d..3628b04fc4f4f4663b3780eadac6ff9e430e4900 100644
index 1f1f1a0cb84a07087025fd831441d0571d6de7c6..423da11d4910bbe12625ec5a16edfd6e80cd3dea 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -525,11 +525,21 @@ public class ChunkRegionLoader {
@@ -518,11 +518,21 @@ public class ChunkRegionLoader {
chunk.d(false);
@@ -48,7 +48,7 @@ index 64dd95292fb4d058f6200bfcadaedfbd62b2461d..3628b04fc4f4f4663b3780eadac6ff9e
NBTTagCompound nbttagcompound4 = new NBTTagCompound();
// Paper start
if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
@@ -660,10 +670,20 @@ public class ChunkRegionLoader {
@@ -653,10 +663,20 @@ public class ChunkRegionLoader {
NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
World world = chunk.getWorld();

6
patches/server/0071-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97fe68655d 100644
index 423da11d4910bbe12625ec5a16edfd6e80cd3dea..77f31dc1e45b438ece691617deb17d7a5fbbc94b 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -532,6 +532,7 @@ public class ChunkRegionLoader {
@@ -525,6 +525,7 @@ public class ChunkRegionLoader {
while (iterator1.hasNext()) {
Entity entity = (Entity) iterator1.next();
@@ -17,7 +17,7 @@ index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97
final EntityTypes<?> projectileType = entity.getEntityType();
if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc..ca7189dbf4f8e71163de55ee89cad15390744f96 100644
index cbdfc8d929f9419d49b0642e8cfc7219741e0e38..85f7c97136195bd7c77685244e89ceedec72dee5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0072-Configurable-void-damage-height.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ca7189dbf4f8e71163de55ee89cad15390744f96..ea1bccdc776c6eddbad1407cdc31a889875c8909 100644
index 85f7c97136195bd7c77685244e89ceedec72dee5..2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0079-Implement-elytra-settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7bffafb7b2b6124b8ca1400e99fa5973e96793f2..93512ebabf8ab4626dea50d7a3e80fa3333a1e91 100644
index 435726651ada6ccb4bbd31fe21a439d29f131098..be5f2147e9cded85620a57a90c7d800262fc3d6e 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2851,7 +2851,16 @@ public abstract class EntityLiving extends Entity {

6
patches/server/0080-Item-entity-immunities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612b6efcd30 100644
index 2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d..308cb9cfb418e63f17f8f39c3db94f93d874763f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1481,6 +1481,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@@ -17,7 +17,7 @@ index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612
return this.O == tag;
}
diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
index f41aaa7623c052b9f4044898d1bdee898c03057a..1ab024c19761d97d0ac81edcc3fb1d9be8c40b5f 100644
index d99cecc4075338d7b8f154ab94d8ac04190ba371..cbe03923d468bf75adc10245ebd9f63ff10987f9 100644
--- a/src/main/java/net/minecraft/server/EntityItem.java
+++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -23,6 +23,8 @@ public class EntityItem extends Entity {

4
patches/server/0083-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -17,10 +17,10 @@ index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c2692d6d667d6404a044f1ad1c24e612b6efcd30..477e95ebecea183a2ad3d1daac3b4010b7263c99 100644
index 308cb9cfb418e63f17f8f39c3db94f93d874763f..d542cd8014a929b421e631075f1ee14423e9b66a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2146,8 +2146,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}

6
patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 93512ebabf8ab4626dea50d7a3e80fa3333a1e91..ef1c5fc24c2ffd2939e9fc10eb15ef96d5f0a3ca 100644
index be5f2147e9cded85620a57a90c7d800262fc3d6e..699afb9759083b42fd0608a3417fd3d17ce8f560 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -280,6 +280,7 @@ public abstract class EntityLiving extends Entity {
@@ -17,10 +17,10 @@ index 93512ebabf8ab4626dea50d7a3e80fa3333a1e91..ef1c5fc24c2ffd2939e9fc10eb15ef96
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 65b95816f885129b83675161478ab19b4a7de8bc..1a8f894fc077d77911c8e70675b647b7c28e20b7 100644
index 36be65f9a36ea1b35ffa882eec295e1f46021f0c..40d2494114348ea256883cb4e8ebd3e02b040b14 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -2378,4 +2378,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2389,4 +2389,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

2
patches/server/0097-Totems-work-in-inventory.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ef1c5fc24c2ffd2939e9fc10eb15ef96d5f0a3ca..64580ce8dc1d0be61615a47c2fb3a6b0fecc93e6 100644
index 699afb9759083b42fd0608a3417fd3d17ce8f560..f1e1db97d611192ff2d4b635ef81cf592adde257 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1327,6 +1327,19 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0098-Fix-death-message-colors.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix death message colors
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1a8f894fc077d77911c8e70675b647b7c28e20b7..7a0d93538fbfcc559acc0ac5897aa05b4d39839f 100644
index 40d2494114348ea256883cb4e8ebd3e02b040b14..d8cb09e809e382c48071d8abc3d952ca4ef64c9b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -841,7 +841,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -852,7 +852,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();

6
patches/server/0106-Add-no-tick-block-list.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add no-tick block list
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 4d1ac4e6b61897fc03b091475ef7be3ed0b228a9..483756316a51780da2122b68e73ffc5fc9d87df3 100644
index 829d4a7508e1656dbdc912096b7eafcf30cbb5b2..6aea156d7c7a9ca8a357aad6a6781d7209c9b8ae 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -655,10 +655,12 @@ public abstract class BlockBase {
@@ -617,10 +617,12 @@ public abstract class BlockBase {
}
public void a(WorldServer worldserver, BlockPosition blockposition, Random random) {
@@ -22,7 +22,7 @@ index 4d1ac4e6b61897fc03b091475ef7be3ed0b228a9..483756316a51780da2122b68e73ffc5f
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e26fc1a6032027d16e72931c8329196b683774ba..9d93a8c86b675cf55210724a0b695f960b009d69 100644
index 93f09acd2ca26793bc0771a6cc5419bfa8536816..d86fa84b48d2c2b3bf4619788bdc64d22212661d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -314,14 +314,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0109-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 477e95ebecea183a2ad3d1daac3b4010b7263c99..a12bcda00cb615b0832157f633c4a987e78c8404 100644
index d542cd8014a929b421e631075f1ee14423e9b66a..bbe567dad1212ad3a49503ca9b33c3f28c58a16d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3438,8 +3438,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3450,8 +3450,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.lastYaw = this.yaw;
}

24
patches/server/0110-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 bbe567dad1212ad3a49503ca9b33c3f28c58a16d..0be1f47b13f617a7aaad4d6334929d9e5f943d3e 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
@@ -200,7 +200,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1480,6 +1480,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1491,6 +1491,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2235,6 +2236,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2246,6 +2247,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2330,6 +2332,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2341,6 +2343,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
}
return true; // CraftBukkit
}
@@ -2370,6 +2379,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2381,6 +2390,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -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
@@ -2546,6 +2561,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
@@ -2768,6 +2784,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
@@ -3203,6 +3220,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
@@ -3655,4 +3684,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -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 64580ce8dc1d0be61615a47c2fb3a6b0fecc93e6..418744b166571973a02dd6a31f0cc08376980076 100644
index f1e1db97d611192ff2d4b635ef81cf592adde257..81e362c6e0b9e6dde5df3f9009ecc8fdc1943789 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -462,7 +462,7 @@ public abstract class EntityLiving extends Entity {
@@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7a0d93538fbfcc559acc0ac5897aa05b4d39839f..013f281a686adef9a678ace4051c5e51ab677378 100644
index d8cb09e809e382c48071d8abc3d952ca4ef64c9b..beb0a4b91a8abd0374ae40771009832ddf8978f7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -5041,7 +5041,7 @@ index 7a82a894bb3f737cc80f0b4b8d7a1b25ce1afc6c..bdfdb73bc1305d3fbda2e0ebe8163bf4
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86ddc5346cc2 100644
index d86fa84b48d2c2b3bf4619788bdc64d22212661d..c402803a364908b854efdb5777f355ac5fee51a4 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0112-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -17,10 +17,10 @@ index 1fc98698b81c079ebe4a524200232db1fe143bdf..d621b11ba9029a732a819e0558d6f8a4
return this == block;
}
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 483756316a51780da2122b68e73ffc5fc9d87df3..5550693a4ea0c1d99abb35b826d09963bc6c45fd 100644
index 6aea156d7c7a9ca8a357aad6a6781d7209c9b8ae..b40f5167d2a9772658c115091f13706fbb4959b7 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -725,6 +725,7 @@ public abstract class BlockBase {
@@ -687,6 +687,7 @@ public abstract class BlockBase {
return this.getBlock().a(tag) && predicate.test(this);
}

6
patches/server/0113-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55af8373f1 100644
index 0be1f47b13f617a7aaad4d6334929d9e5f943d3e..b882c049870e461472fe3252922f206c6045dbff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2422,7 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -2984,7 +2984,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2996,7 +2996,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {

2
patches/server/0116-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -42,7 +42,7 @@ index bdfdb73bc1305d3fbda2e0ebe8163bf43b8aede5..ab97d076c921e1fd3ba69ed4b93d43e9
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index bed00077205d3c2d7b2eb67db5af86ddc5346cc2..a1069b64b3af02cbd5d2808275c09d7680c7c1c6 100644
index c402803a364908b854efdb5777f355ac5fee51a4..9eceeb44b19533d80f591850ab496b24b3605a4b 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -332,7 +332,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {

6
patches/server/0126-Configurable-daylight-cycle.patch
View File

@@ -18,7 +18,7 @@ index 88c3d7efaf467c1c1487f589c2cdbfb6aba734ec..fed1ce95038ead72a663f5a562dd4628
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a1069b64b3af02cbd5d2808275c09d7680c7c1c6..790473d51ee49340f3f2b17a195e63902a2bf779 100644
index 9eceeb44b19533d80f591850ab496b24b3605a4b..0789281a18fd9dc8aab2def638f45510dc29dabc 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -37,7 +37,7 @@ index a1069b64b3af02cbd5d2808275c09d7680c7c1c6..790473d51ee49340f3f2b17a195e6390
}
// Tuinity start - optimise collision
@@ -1017,7 +1019,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -957,7 +959,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.nextTickListBlock.nextTick(); // Paper
this.nextTickListFluid.nextTick(); // Paper
this.worldDataServer.u().a(this.server, i);
@@ -60,7 +60,7 @@ index a1069b64b3af02cbd5d2808275c09d7680c7c1c6..790473d51ee49340f3f2b17a195e6390
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -1026,6 +1042,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -966,6 +982,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);

4
patches/server/0130-Add-tablist-suffix-option-for-afk.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 013f281a686adef9a678ace4051c5e51ab677378..988e8545d4f9bf0fb0b8b8b482a29775b8a5c9f1 100644
index beb0a4b91a8abd0374ae40771009832ddf8978f7..3906805c5d6b9203e1ad160207154493660c8188 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1961,7 +1961,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1972,7 +1972,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
if (world.purpurConfig.idleTimeoutUpdateTabList) {

2
patches/server/0134-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -86,7 +86,7 @@ index ace2bb69fcde9af2a1691a25ae945bfe44ce117b..2169de3c4118fca7048f9939a9570939
}
}
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 16c8f2cdf7120337bec6f1d28822f3219c7d2d8f..19460d885682b1f182dcfbe13e11dae3fd98248d 100644
index 661db537f6ac2b5a80e2e40a25966a2e3039199d..a43a42aa696994a17dda790d01d09e0abdaade00 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -199,7 +199,13 @@ public class EntityItemFrame extends EntityHanging {

4
patches/server/0146-Add-boat-fall-damage-config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 988e8545d4f9bf0fb0b8b8b482a29775b8a5c9f1..59f24ab35da5e3eb4d71dc9b3445abd6a2536266 100644
index 3906805c5d6b9203e1ad160207154493660c8188..50cd947d0e47e7897a071fdf8ff6e5834e137d58 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1019,7 +1019,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1030,7 +1030,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.isInvulnerable(damagesource)) {
return false;
} else {

4
patches/server/0149-PaperPR-Apply-advancements-async.patch
View File

@@ -51,7 +51,7 @@ index 98c3884f478aed1eba82c15f258ebfa1c7203b14..244b58a7c41d2b0ba3117550282e68a1
} catch (ParseException parseexception) {
throw new JsonSyntaxException("Invalid datetime: " + s, parseexception);
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 59f24ab35da5e3eb4d71dc9b3445abd6a2536266..e7fc241d879ec96862d9a82d784538f93e559051 100644
index 50cd947d0e47e7897a071fdf8ff6e5834e137d58..5e4cc5e8f71c1c657041159305ce3e4a9aa9f46b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -51,7 +51,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -83,7 +83,7 @@ index 59f24ab35da5e3eb4d71dc9b3445abd6a2536266..e7fc241d879ec96862d9a82d784538f9
// Purpur start
if (this.world.purpurConfig.useNightVisionWhenRiding && this.getVehicle() != null && this.getVehicle().getRider() == this && world.getTime() % 100 == 0) { // 5 seconds
@@ -2123,7 +2125,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2134,7 +2136,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.worldChangeInvuln = false;
}

2
patches/server/0153-Lobotomize-stuck-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 28c502b5721bd150d9b9d2d84cb07c55af8373f1..98e8f8d7751ca7489c7cb4d41e4f628dec7b5c5d 100644
index b882c049870e461472fe3252922f206c6045dbff..073be230a8c0e2ccf6b4304e2988c270749f1a35 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0157-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
Rabid wolves attack all players, mobs, and animals.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 418744b166571973a02dd6a31f0cc08376980076..ac14c0455cc92ea9f6af1d5451062ecab9980c69 100644
index 81e362c6e0b9e6dde5df3f9009ecc8fdc1943789..60216266e9b18871b7b00be55805bce191e2105b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2094,6 +2094,7 @@ public abstract class EntityLiving extends Entity {