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

Update to 1.14.3

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-25 21:12:19 -05:00
parent 5d6c6b7efa
commit 4bc7fbcdfa
23 changed files with 444 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 768b46ed63...dc841f3379

2
current-paper
View File

@@ -1 +1 @@
1.14.2--1a214f52c1eb403badd3ff9be853dcb3b0baf558
1.14.3--1d5c0ba661303537aa487c2f2911c0719174e6ae

15
patches/api/0001-Rebrand.patch
View File

@@ -1,17 +1,17 @@
From e66647c96a1fe0ae4b24ba3c951c376e34a81ec5 Mon Sep 17 00:00:00 2001
From e34025c2fa5e91b19fc492dc9f45d5a5367f5ef0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 00:57:16 -0500
Subject: [PATCH] Rebrand
---
pom.xml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
pom.xml | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b8334d62..b7a16cbaf 100644
index df8fc5173..aa94a7c76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,17 @@
@@ -3,19 +3,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,7 +25,8 @@ index 4b8334d62..b7a16cbaf 100644
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-api</artifactId>
+ <artifactId>purpur-api</artifactId>
<version>1.14.2-R0.1-SNAPSHOT</version>
<version>1.14.3-R0.1-SNAPSHOT</version>
-
<packaging>jar</packaging>
- <name>Paper-API</name>
@@ -35,7 +36,7 @@ index 4b8334d62..b7a16cbaf 100644
<description>An enhanced plugin API for Minecraft servers.</description>
<properties>
@@ -150,7 +149,7 @@
@@ -150,7 +148,7 @@
</dependencies>
<build>

18
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From b80fe4e5e4bfaf7ff2035a1ceff661d2a7e30867 Mon Sep 17 00:00:00 2001
From 375624ad813fe43f8902d8b90813d1d71b8f4678 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
diff --git a/pom.xml b/pom.xml
index 2cb84223e..58096a29e 100644
index 1f3571dd0f..6dab6763da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
@@ -25,7 +25,7 @@ index 2cb84223e..58096a29e 100644
- <artifactId>paper</artifactId>
+ <artifactId>purpur</artifactId>
<packaging>jar</packaging>
<version>1.14.2-R0.1-SNAPSHOT</version>
<version>1.14.3-R0.1-SNAPSHOT</version>
- <name>Paper</name>
- <url>https://papermc.io</url>
+ <name>Purpur</name>
@@ -73,7 +73,7 @@ index 2cb84223e..58096a29e 100644
</configuration>
<executions>
diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
index cd6e25923..bb227bc0f 100644
index cd6e259239..bb227bc0fb 100644
--- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
+++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole {
@@ -86,7 +86,7 @@ index cd6e25923..bb227bc0f 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3dbe83c7e..fc57f154f 100644
index 2b99fdc630..5ec9a980c9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1423,7 +1423,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -100,7 +100,7 @@ index 3dbe83c7e..fc57f154f 100644
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
new file mode 100644
index 000000000..d8b408f06
index 0000000000..d8b408f061
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
@@ -0,0 +1,115 @@
@@ -220,7 +220,7 @@ index 000000000..d8b408f06
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5884d92f8..9f78e8543 100644
index c1834d18b7..c0ac212bc3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -200,7 +200,7 @@ import javax.annotation.Nullable; // Paper
@@ -233,7 +233,7 @@ index 5884d92f8..9f78e8543 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index ee5616cdf..b65c889ee 100644
index f9059b2578..b92a8f9cb2 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -279,7 +279,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -246,7 +246,7 @@ index ee5616cdf..b65c889ee 100644
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 674096cab..e9aee2d8a 100644
index 674096cab1..e9aee2d8a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -11,7 +11,7 @@ public final class Versioning {

10
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 135c65d603a658d4a6c5690a34b48c6f5b347b40 Mon Sep 17 00:00:00 2001
From a7a2dcc5ee627a8bc612f05449f5fc4f2ea36e1a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files
@@ -15,10 +15,10 @@ Subject: [PATCH] Purpur config files
create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 3d452fe0e3..22e81ee105 100644
index c1473330fa..3e32c211c7 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -172,6 +172,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -174,6 +174,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -34,7 +34,7 @@ index 3d452fe0e3..22e81ee105 100644
// Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1defbd9747..b37e081fc3 100644
index a7a35d6a6f..c8f198fdf0 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -243,7 +243,7 @@ index 0000000000..30f11fe261
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9f78e85438..e7d80fd58c 100644
index c0ac212bc3..624ee90b68 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -788,6 +788,7 @@ public final class CraftServer implements Server {

6
patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From e5c8e31b455e9e54bd0f575a0f2f6af2e8840227 Mon Sep 17 00:00:00 2001
From a0d76f3208f533582021f3a6333bff412464ecf4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -10,10 +10,10 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
3 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fae57a0998..352b6dfb3e 100644
index c5198af94b..485da37a73 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -999,6 +999,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1048,6 +1048,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}

12
patches/server/0004-PlayerFeedAnimalEvent.patch
View File

@@ -1,4 +1,4 @@
From 85502589238590465c50bdff0c2283ce3b021fa4 Mon Sep 17 00:00:00 2001
From c104ebc514f96b6289079924d701f44951f29305 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:39:38 -0500
Subject: [PATCH] PlayerFeedAnimalEvent
@@ -8,10 +8,10 @@ Subject: [PATCH] PlayerFeedAnimalEvent
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityAnimal.java b/src/main/java/net/minecraft/server/EntityAnimal.java
index dbce8a866..8a4594654 100644
index eab32ec041..38920dab9e 100644
--- a/src/main/java/net/minecraft/server/EntityAnimal.java
+++ b/src/main/java/net/minecraft/server/EntityAnimal.java
@@ -110,6 +110,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -103,6 +103,7 @@ public abstract class EntityAnimal extends EntityAgeable {
return 1 + this.world.random.nextInt(3);
}
@@ -19,13 +19,13 @@ index dbce8a866..8a4594654 100644
public boolean i(ItemStack itemstack) {
return itemstack.getItem() == Items.WHEAT;
}
@@ -118,7 +119,7 @@ public abstract class EntityAnimal extends EntityAgeable {
@@ -111,7 +112,7 @@ public abstract class EntityAnimal extends EntityAgeable {
public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
ItemStack itemstack = entityhuman.b(enumhand);
- if (this.i(itemstack)) {
+ if (this.isBreedingItem(itemstack) && new net.pl3x.purpur.event.PlayerFeedAnimalEvent((org.bukkit.entity.Animals) getBukkitEntity(), (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), itemstack.asBukkitCopy()).callEvent()) { // Purpur
if (this.getAge() == 0 && this.ea()) {
+ if (this.i(itemstack) && new net.pl3x.purpur.event.PlayerFeedAnimalEvent((org.bukkit.entity.Animals) getBukkitEntity(), (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), itemstack.asBukkitCopy()).callEvent()) { // Purpur
if (this.getAge() == 0 && this.eb()) {
this.a(entityhuman, itemstack);
this.f(entityhuman);
--

6
patches/server/0006-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -1,4 +1,4 @@
From 6e9f28ddbb366425610b4608758b4f256aa9dc4f Mon Sep 17 00:00:00 2001
From 87a60fa232ee8a521f6d3b8e1d9b27f21ecec0af Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 23:53:16 -0500
Subject: [PATCH] Fix cow rotation when shearing mooshroom
@@ -8,10 +8,10 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom
1 file changed, 6 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
index 76712996f..d2de3589a 100644
index d1059355ad..6bfffb4077 100644
--- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
+++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
@@ -92,7 +92,13 @@ public class EntityMushroomCow extends EntityCow {
@@ -101,7 +101,13 @@ public class EntityMushroomCow extends EntityCow {
entitycow.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
entitycow.setHealth(this.getHealth());

10
patches/server/0008-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From 88a11594846770c4b43a2c61019044db0c1303a2 Mon Sep 17 00:00:00 2001
From 4197a16281fc9dfa77cd5f5ed098db1fe2fdfe79 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -26,7 +26,7 @@ index d9e5eaad12..bcbade19ea 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 8ce2fca806..686bca4f2c 100644
index b06bbc45cf..e08eaddef3 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -179,7 +179,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -39,7 +39,7 @@ index 8ce2fca806..686bca4f2c 100644
if (i > 0) {
this.damageEntity(DamageSource.FALL, (float) i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 17ee1c3eb7..9ba7a16102 100644
index d44ea9ec5d..c2d83bf3eb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -50,7 +50,7 @@ index 17ee1c3eb7..9ba7a16102 100644
boolean forceDrops;
ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
@@ -1528,7 +1529,7 @@ public abstract class EntityLiving extends Entity {
@@ -1530,7 +1531,7 @@ public abstract class EntityLiving extends Entity {
super.b(f, f1);
MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
@@ -60,7 +60,7 @@ index 17ee1c3eb7..9ba7a16102 100644
if (i > 0) {
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
index 6404b32b24..f8a8da6372 100644
index 156a70a6cd..75616ac878 100644
--- a/src/main/java/net/minecraft/server/EntityLlama.java
+++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -344,7 +344,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn

8
patches/server/0009-Silk-touch-spawners.patch
View File

@@ -1,4 +1,4 @@
From c7c4b4cb423efb7af5bf71d0c2111a7b8adadf18 Mon Sep 17 00:00:00 2001
From 38e634bad7487c17e998ca79edc18ca82da1dd1b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 14:27:37 -0500
Subject: [PATCH] Silk touch spawners
@@ -13,7 +13,7 @@ Subject: [PATCH] Silk touch spawners
create mode 100644 src/main/java/net/minecraft/server/ItemSpawner.java
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 8f809a4ee4..44348130a2 100644
index 5d8db912a6..8e16162a7b 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -493,6 +493,7 @@ public class Block implements IMaterial {
@@ -22,7 +22,7 @@ index 8f809a4ee4..44348130a2 100644
+ public static void dropItem(World world, BlockPosition blockposition, ItemStack itemstack) { a(world, blockposition, itemstack); } // Purpur - OBFHELPER
public static void a(World world, BlockPosition blockposition, ItemStack itemstack) {
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean("doTileDrops")) {
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
float f = 0.5F;
diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
index bb77d916ab..974a5d2816 100644
@@ -78,7 +78,7 @@ index bb77d916ab..974a5d2816 100644
return i;
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 77d4bbce19..fb0c6bce03 100644
index eaacc9bff8..ec63f1dbe1 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -137,6 +137,12 @@ public class EntityTypes<T extends Entity> {

598
patches/server/0011-Integrate-ridables.patch
View File

File diff suppressed because it is too large Load Diff

28
patches/server/0012-Villager-shops.patch
View File

@@ -1,4 +1,4 @@
From 3b36f995d5ae145ef691c4d1cd2dcb900a7ca302 Mon Sep 17 00:00:00 2001
From 81f64701611873719511ea2e2254cad9000789a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 11 May 2019 01:31:50 -0500
Subject: [PATCH] Villager shops
@@ -13,7 +13,7 @@ Subject: [PATCH] Villager shops
create mode 100644 src/main/java/net/minecraft/server/EntityVillagerShop.java
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 4979f77b7..475c3ec63 100644
index 4aac81d3a5..1c110c15ae 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -118,6 +118,7 @@ public class EntityTypes<T extends Entity> {
@@ -38,20 +38,20 @@ index 4979f77b7..475c3ec63 100644
return IRegistry.ENTITY_TYPE.get(key);
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
index f8ef10f90..6f3cee8c1 100644
index d1a88960bd..fee6875274 100644
--- a/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityVillagerAbstract.java
@@ -68,6 +68,7 @@ public abstract class EntityVillagerAbstract extends EntityAgeable implements NP
return this.tradingPlayer;
}
+ public boolean hasTrader() { return dY(); } // Purpur - OBFHELPER
public boolean dY() {
+ public boolean hasTrader() { return dZ(); } // Purpur - OBFHELPER
public boolean dZ() {
return this.tradingPlayer != null;
}
diff --git a/src/main/java/net/minecraft/server/EntityVillagerShop.java b/src/main/java/net/minecraft/server/EntityVillagerShop.java
new file mode 100644
index 000000000..eb7213217
index 0000000000..0cb1b117fa
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityVillagerShop.java
@@ -0,0 +1,227 @@
@@ -137,12 +137,12 @@ index 000000000..eb7213217
+ }
+
+ @Override
+ public int dV() { // getExp
+ public int dW() { // getExp
+ return 0;
+ }
+
+ @Override
+ public boolean ea() { // showProfessionProgressBar
+ public boolean eb() { // showProfessionProgressBar
+ return false;
+ }
+
@@ -153,7 +153,7 @@ index 000000000..eb7213217
+ itemstack.a(entityhuman, this, enumhand);
+ return true;
+ }
+ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.dY() && !this.isSleeping()) {
+ if (itemstack.getItem() != Items.VILLAGER_SPAWN_EGG && this.isAlive() && !this.hasTrader() && !this.isSleeping()) {
+ if (enumhand == EnumHand.MAIN_HAND) {
+ entityhuman.a(StatisticList.TALKED_TO_VILLAGER);
+ }
@@ -188,7 +188,7 @@ index 000000000..eb7213217
+ }
+
+ @Override
+ protected void ef() { // setupTradeOffers
+ protected void ei() { // setupTradeOffers
+ // do not do anything
+ }
+
@@ -272,7 +272,7 @@ index 000000000..eb7213217
+ return; // already on a path
+ }
+ BlockPosition home = villager.getHome();
+ if (!home.a(villager.ch(), range)) {
+ if (!home.a(villager.getHome(), range)) {
+ Vec3D direction = new Vec3D(home).add(-villager.locX, -villager.locY, -villager.locZ).d(); // normalize
+ Vec3D target = direction.a(10.0D).add(villager.locX, villager.locY, villager.locZ); // scale
+ villager.navigation.setDestination(target.x, target.y, target.z, speed);
@@ -283,7 +283,7 @@ index 000000000..eb7213217
+ }
+}
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 856ff22b0..8ed86e25f 100644
index d8da790aec..b044c82b14 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -123,6 +123,7 @@ public abstract class NavigationAbstract {
@@ -294,7 +294,7 @@ index 856ff22b0..8ed86e25f 100644
public boolean a(double d0, double d1, double d2, double d3) {
return this.a(this.a(d0, d1, d2), d3);
}
@@ -255,6 +256,7 @@ public abstract class NavigationAbstract {
@@ -239,6 +240,7 @@ public abstract class NavigationAbstract {
}
@@ -303,7 +303,7 @@ index 856ff22b0..8ed86e25f 100644
return this.c == null || this.c.b();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
index 18520fec0..307331e37 100644
index 18520fec05..307331e377 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractVillager.java
@@ -20,7 +20,7 @@ public class CraftAbstractVillager extends CraftAgeable implements AbstractVilla

6
patches/server/0013-Make-giants-naturally-spawn-and-have-AI.patch
View File

@@ -1,4 +1,4 @@
From e527d46c950ca5654441e03dea8f583749779fa0 Mon Sep 17 00:00:00 2001
From 677fc4c86d5a60ea81466d589965df52b7998c7c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 12 May 2019 00:43:12 -0500
Subject: [PATCH] Make giants naturally spawn and have AI
@@ -58,7 +58,7 @@ index f4698a6809..3f7f7a2de8 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
index b7e2022b19..d618c23ef8 100644
index b7e2022b19..28b93ce736 100644
--- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
+++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
@@ -1,5 +1,7 @@
@@ -92,7 +92,7 @@ index b7e2022b19..d618c23ef8 100644
+ }
+
+ @Override
+ public float cW() { // jump height
+ public float cX() { // jump height
+ // make giants jump as high as everything else relative to their size
+ // 1.0 makes bottom of feet about as high as their waist when they jump
+ return 1.0F;

12
patches/server/0016-Add-regen-effect-to-campfires.patch
View File

@@ -1,4 +1,4 @@
From 74feb86c1e53deca4d2904bc49702263b5095f2d Mon Sep 17 00:00:00 2001
From b6f682d729fd517aadd3e13ff1cd103df00aaa9a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 19 May 2019 18:11:53 -0500
Subject: [PATCH] Add regen effect to campfires
@@ -11,10 +11,10 @@ Subject: [PATCH] Add regen effect to campfires
4 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 38a0e4978..b1372c71d 100644
index 694200deb2..1704609a7d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2713,10 +2713,19 @@ public abstract class EntityLiving extends Entity {
@@ -2715,10 +2715,19 @@ public abstract class EntityLiving extends Entity {
}
public boolean hasLineOfSight(Entity entity) {
@@ -38,7 +38,7 @@ index 38a0e4978..b1372c71d 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index 47fc8b031..dff7568d2 100644
index acf6082e7f..b0732da909 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -91,6 +91,7 @@ public class EntityPotion extends EntityProjectile {
@@ -82,7 +82,7 @@ index 47fc8b031..dff7568d2 100644
AxisAlignedBB axisalignedbb = this.getBoundingBox().grow(4.0D, 2.0D, 4.0D);
List<EntityLiving> list = this.world.a(EntityLiving.class, axisalignedbb, EntityPotion.e);
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
index 2317adde4..7360e462d 100644
index 2317adde44..7360e462d9 100644
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
@@ -14,6 +14,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
@@ -151,7 +151,7 @@ index 2317adde4..7360e462d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 30f11fe26..5e9c633ac 100644
index 30f11fe261..5e9c633ac8 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -60,4 +60,25 @@ public class PurpurWorldConfig {

16
patches/server/0017-Tick-loop-config-options.patch
View File

@@ -1,4 +1,4 @@
From 73b651b11025e6e1648f0443de1e6f7e946c1deb Mon Sep 17 00:00:00 2001
From 097fb95e55092078634a4fa36161cf604a76a801 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 22 May 2019 22:30:08 -0500
Subject: [PATCH] Tick loop config options
@@ -9,10 +9,10 @@ Subject: [PATCH] Tick loop config options
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fc57f154f5..0a4d37cd42 100644
index 5ec9a980c9..0324a90ca5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -865,16 +865,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -868,16 +868,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
lastTick = start - TICK_TIME; // Paper
while (this.isRunning) {
@@ -43,16 +43,16 @@ index fc57f154f5..0a4d37cd42 100644
if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
{
@@ -905,7 +910,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -908,7 +913,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(this::canSleepForTick);
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
- this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
this.ab = true;
- this.aa = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
+ // Purpur start - tps catchup
+ if (net.pl3x.purpur.PurpurConfig.enableTPSCatchup) {
+ this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
+ this.aa = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
+ } else {
+ this.ab = this.nextTick = curTime / 1000000L + 50L;
+ this.aa = this.nextTick = curTime / 1000000L + 50L;
+ }
+ // Purpur end - tps catchup
this.sleepForTick();

25
patches/server/0022-Add-village-raid-spawn-reason.patch
View File

@@ -1,31 +1,22 @@
From 4adfecc557917b0a5a882974f098d6f5fc635c05 Mon Sep 17 00:00:00 2001
From 5f33b2313df6d8637756b6e5503dcdbf36bb3e82 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 29 May 2019 23:39:04 -0500
Subject: [PATCH] Add village raid spawn reason
---
src/main/java/net/minecraft/server/Raid.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
src/main/java/net/minecraft/server/Raid.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
index ba19b1d51..1484f39f1 100644
index 58c33f1000..0a796a8264 100644
--- a/src/main/java/net/minecraft/server/Raid.java
+++ b/src/main/java/net/minecraft/server/Raid.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
@@ -512,7 +514,7 @@ public class Raid {
entityraider.prepare(this.l, this.l.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
@@ -524,7 +524,7 @@ public class Raid {
entityraider.prepare(this.k, this.k.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
entityraider.a(i, false);
entityraider.onGround = true;
- this.l.addEntity(entityraider);
+ this.l.addEntity(entityraider, CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
- this.k.addEntity(entityraider);
+ this.k.addEntity(entityraider, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_RAID); // Purpur
}
}

12
patches/server/0025-Dont-spaz-out-startup-on-custom-world-generators.patch
View File

@@ -1,4 +1,4 @@
From 7cf0027f0c5e4babd9f158bb9105c7fd60537516 Mon Sep 17 00:00:00 2001
From 02de5da64c505229d1928fd4a429f75c1940f562 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 2 Jun 2019 02:36:59 -0500
Subject: [PATCH] Dont spaz out startup on custom world generators
@@ -8,15 +8,15 @@ Subject: [PATCH] Dont spaz out startup on custom world generators
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
index d4b0cca23..ac8e23237 100644
index ca4c314589..610637b46e 100644
--- a/src/main/java/net/minecraft/server/WorldData.java
+++ b/src/main/java/net/minecraft/server/WorldData.java
@@ -300,7 +300,7 @@ public class WorldData {
@@ -299,7 +299,7 @@ public class WorldData {
this.a(worldsettings);
this.levelName = s;
this.G = WorldData.a;
- this.F = false;
+ this.F = true; // Purpur
this.F = WorldData.a;
- this.E = false;
+ this.E = true; // Purpur
}
public void a(WorldSettings worldsettings) {

14
patches/server/0027-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From 4eec5d1965f0c06f9c6823c8f00bc604527dfeac Mon Sep 17 00:00:00 2001
From 7e414462234062bc6c9f42a832f59a3c51685801 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs
4 files changed, 21 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d27354667..babbc4add 100644
index 633fe836dd..160c03efd8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1112,6 +1112,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1114,6 +1114,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);
@@ -23,10 +23,10 @@ index d27354667..babbc4add 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a0b644801..ae65231ce 100644
index 6d6e50313e..671d1085e0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2593,6 +2593,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2592,6 +2592,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
@@ -35,7 +35,7 @@ index a0b644801..ae65231ce 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index dd7889a4f..2f9db45a1 100644
index dd7889a4f9..2f9db45a12 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -122,6 +122,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -60,7 +60,7 @@ index dd7889a4f..2f9db45a1 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7f996591f..490c2ede6 100644
index 7f996591fa..490c2ede60 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -91,4 +91,9 @@ public class PurpurWorldConfig {

10
patches/server/0029-Add-config-for-items-breaking-turtle-eggs.patch
View File

@@ -1,4 +1,4 @@
From 86ab92142299a1e2412d3aeebea99d4cabac9508 Mon Sep 17 00:00:00 2001
From f2c0268badfcffd1e43a9fba97f02b4401c04173 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] Add config for items breaking turtle eggs
@@ -9,14 +9,14 @@ Subject: [PATCH] Add config for items breaking turtle eggs
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
index a32ea2a4f..37a394d92 100644
index fd91785bfe..5bb645eb9c 100644
--- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
+++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
@@ -163,6 +163,17 @@ public class BlockTurtleEgg extends Block {
}
private boolean a(World world, Entity entity) {
- return entity instanceof EntityTurtle ? false : (entity instanceof EntityLiving && !(entity instanceof EntityHuman) ? world.getGameRules().getBoolean("mobGriefing") : true);
- return entity instanceof EntityTurtle ? false : (entity instanceof EntityLiving && !(entity instanceof EntityHuman) ? world.getGameRules().getBoolean(GameRules.MOB_GRIEFING) : true);
+ // Purpur start
+ if (entity instanceof EntityTurtle) {
+ return false;
@@ -25,14 +25,14 @@ index a32ea2a4f..37a394d92 100644
+ return false;
+ }
+ if (entity instanceof EntityLiving && !(entity instanceof EntityHuman)) {
+ return world.getGameRules().getBoolean("mobGriefing");
+ return world.getGameRules().getBoolean(GameRules.MOB_GRIEFING);
+ }
+ return true;
+ // Purpur end
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7f1c3ccb6..a649a4c35 100644
index 7f1c3ccb6c..a649a4c359 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -101,4 +101,9 @@ public class PurpurWorldConfig {

12
patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From 1a31c3947216fa6cfe3893f00c5783e88b69e5fd Mon Sep 17 00:00:00 2001
From c84db70f17617685b8f4386188ed65a63f96894e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -10,7 +10,7 @@ Subject: [PATCH] Block and Fluid Tick Events
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 135ec94c6f..a077859418 100644
index ec3b6ec5cf..3b6b9b108c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -446,13 +446,13 @@ public class WorldServer extends World {
@@ -24,8 +24,8 @@ index 135ec94c6f..a077859418 100644
Fluid fluid = chunksection.b(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
- if (fluid.g()) {
+ if (fluid.g() && (!purpurConfig.fluidTickEvent || new net.pl3x.purpur.event.block.FluidTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur
- if (fluid.h()) {
+ if (fluid.h() && (!purpurConfig.fluidTickEvent || new net.pl3x.purpur.event.block.FluidTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur
fluid.b(this, blockposition2, this.random);
}
@@ -62,10 +62,10 @@ index a649a4c359..92eeaca428 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9bb1ad077a..c404c7ff44 100644
index 3e55033d3c..748b817e90 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2174,6 +2174,24 @@ public class CraftWorld implements World {
@@ -2210,6 +2210,24 @@ public class CraftWorld implements World {
}
// Paper end

61
patches/server/0032-Phantoms-spawn-naturally-in-the-end.patch
View File

@@ -1,15 +1,14 @@
From 25302a92dd438714b58ac0d0e2c97c626720e44c Mon Sep 17 00:00:00 2001
From fd0bed9291b83e36b08ca54a76b99725bb9611fb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 20 Jun 2019 18:48:58 -0500
Subject: [PATCH] Phantoms spawn naturally in the end
---
.../java/net/minecraft/server/BiomeTheEndHighIsland.java | 3 ++-
src/main/java/net/minecraft/server/EntityPhantom.java | 4 +++-
.../java/net/minecraft/server/EntityPositionTypes.java | 3 ++-
src/main/java/net/minecraft/server/SpawnerCreature.java | 7 +++++++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
5 files changed, 19 insertions(+), 3 deletions(-)
.../net/minecraft/server/BiomeTheEndHighIsland.java | 3 ++-
src/main/java/net/minecraft/server/EntityPhantom.java | 10 +++++++++-
.../java/net/minecraft/server/SpawnerCreature.java | 6 ++++++
src/main/java/net/pl3x/purpur/PurpurConfig.java | 5 +++++
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java b/src/main/java/net/minecraft/server/BiomeTheEndHighIsland.java
index 6592d15291..67cb1520be 100644
@@ -29,7 +28,7 @@ index 6592d15291..67cb1520be 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 5808363b0f..49ae359675 100644
index 8517fcf293..124bcc884e 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -10,7 +10,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -41,7 +40,20 @@ index 5808363b0f..49ae359675 100644
private EntityPhantom.AttackPhase bz;
private BlockPosition crystalPosition; // Purpur
@@ -100,6 +100,8 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -26,6 +26,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
this.canBeRiddenInWater = false; // Purpur
}
+ // Purpur start
+ public static boolean canSpawn(EntityTypes<? extends EntityPhantom> entitytypes, GeneratorAccess world, EnumMobSpawn enummobspawn, BlockPosition position, java.util.Random random) {
+ return world.getDifficulty() != EnumDifficulty.PEACEFUL && a(entitytypes, world, enummobspawn, position, random);
+ }
+ // Purpur end
+
@Override
protected EntityAIBodyControl o() {
return new EntityPhantom.d(this);
@@ -100,6 +106,8 @@ public class EntityPhantom extends EntityFlying implements IMonster {
this.world.addParticle(Particles.MYCELIUM, this.locX - (double) f2, this.locY + (double) f4, this.locZ - (double) f3, 0.0D, 0.0D, 0.0D);
}
@@ -50,29 +62,8 @@ index 5808363b0f..49ae359675 100644
if (!this.world.isClientSide && this.world.getDifficulty() == EnumDifficulty.PEACEFUL) {
this.die();
}
diff --git a/src/main/java/net/minecraft/server/EntityPositionTypes.java b/src/main/java/net/minecraft/server/EntityPositionTypes.java
index c867b80b6c..a6b9e0e79a 100644
--- a/src/main/java/net/minecraft/server/EntityPositionTypes.java
+++ b/src/main/java/net/minecraft/server/EntityPositionTypes.java
@@ -55,6 +55,7 @@ public class EntityPositionTypes {
a(EntityTypes.MULE, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING_NO_LEAVES);
a(EntityTypes.OCELOT, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING);
a(EntityTypes.PARROT, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING);
+ a(EntityTypes.PHANTOM, EntityPositionTypes.Surface.IN_AIR, HeightMap.Type.MOTION_BLOCKING_NO_LEAVES); // Purpur
a(EntityTypes.PIG, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING_NO_LEAVES);
a(EntityTypes.PILLAGER, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING_NO_LEAVES);
a(EntityTypes.POLAR_BEAR, EntityPositionTypes.Surface.ON_GROUND, HeightMap.Type.MOTION_BLOCKING_NO_LEAVES);
@@ -81,7 +82,7 @@ public class EntityPositionTypes {
public static enum Surface {
- ON_GROUND, IN_WATER;
+ ON_GROUND, IN_WATER, IN_AIR; // Purpur
private Surface() {}
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index d7e1ed073d..7fd14b807f 100644
index b442e09eb4..3e16cb2bc7 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -75,6 +75,12 @@ public final class SpawnerCreature {
@@ -88,14 +79,6 @@ index d7e1ed073d..7fd14b807f 100644
if (entitytypes.b() && a(chunkgenerator, enumcreaturetype, biomebase_biomemeta, (BlockPosition) blockposition_mutableblockposition)) {
EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes);
@@ -196,6 +202,7 @@ public final class SpawnerCreature {
switch (entitypositiontypes_surface) {
case IN_WATER:
return fluid.a(TagsFluid.WATER) && iworldreader.getFluid(blockposition2).a(TagsFluid.WATER) && !iworldreader.getType(blockposition1).isOccluding(iworldreader, blockposition1);
+ case IN_AIR: return iworldreader.getType(blockposition2).getBlock() == Blocks.AIR; // Purpur
case ON_GROUND:
default:
IBlockData iblockdata1 = iworldreader.getType(blockposition2);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c808ed50ef..afe16a7f55 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

6
patches/server/0034-Fix-errors-trying-to-spawn-negative-number-of-a-mob.patch
View File

@@ -1,4 +1,4 @@
From 1a994b74ee7bd9e9389ec9c1705589f9b66d1426 Mon Sep 17 00:00:00 2001
From 35d4853a95a87c5d392d83263ce924fb23a379d6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 22 Jun 2019 16:17:05 -0500
Subject: [PATCH] Fix errors trying to spawn negative number of a mob
@@ -8,11 +8,11 @@ Subject: [PATCH] Fix errors trying to spawn negative number of a mob
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index 7fd14b807f..e27818d34f 100644
index 3e16cb2bc7..af397dd1f7 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -69,7 +69,10 @@ public final class SpawnerCreature {
break label96;
break label97;
}
- l1 = biomebase_biomemeta.c + world.random.nextInt(1 + biomebase_biomemeta.d - biomebase_biomemeta.c);

32
patches/server/0036-Anti-Xray.patch
View File

@@ -1,4 +1,4 @@
From 7c79f28cea1dd116bb5426eb673c8a9d91cd5a6b Mon Sep 17 00:00:00 2001
From 9723b774d584480d457b3777d8c8334572d9fbd8 Mon Sep 17 00:00:00 2001
From: stonar96 <minecraft.stonar96@gmail.com>
Date: Mon, 20 Aug 2018 03:03:58 +0200
Subject: [PATCH] Anti-Xray
@@ -1107,7 +1107,7 @@ index 0000000000..37093419cf
+ }
+}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index d89ad4e390..aa70bbd31f 100644
index e2a48695df..d19412f186 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -315,7 +315,7 @@ public class Chunk implements IChunkAccess {
@@ -1120,11 +1120,11 @@ index d89ad4e390..aa70bbd31f 100644
}
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
index 799c134e4b..80d18dc308 100644
index 7a76db08fc..5c646c646b 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -196,10 +196,12 @@ public abstract class ChunkMapDistance {
this.f.b(i, this.a(objectsortedset), false);
@@ -177,10 +177,12 @@ public abstract class ChunkMapDistance {
this.e.b(i, this.a(objectsortedset), false);
}
+ public <T> void addTicketLevel(TicketType<T> type, ChunkCoordIntPair chunkPos, int level, T reason) { this.a(type, chunkPos, level, reason); } // Paper - OBFHELPER
@@ -1137,10 +1137,10 @@ index 799c134e4b..80d18dc308 100644
Ticket<T> ticket = new Ticket<>(tickettype, i, t0, this.currentTick);
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 459bd619ee..6e22632dec 100644
index 42b97ba86b..88cd325313 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -512,6 +512,16 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -511,6 +511,16 @@ public class ChunkProviderServer extends IChunkProvider {
});
}
@@ -1158,7 +1158,7 @@ index 459bd619ee..6e22632dec 100644
this.chunkMapDistance.addTicket(tickettype, chunkcoordintpair, i, t0);
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 4906530d83..533562f6ab 100644
index 287f113581..f88e3d957f 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -74,7 +74,7 @@ public class ChunkRegionLoader {
@@ -1180,7 +1180,7 @@ index 4906530d83..533562f6ab 100644
object = protochunk;
protochunk.a(abiomebase);
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
index 43f75fc837..01102f80ec 100644
index c4c181c1d5..609ec29d6b 100644
--- a/src/main/java/net/minecraft/server/ChunkSection.java
+++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -6,21 +6,32 @@ public class ChunkSection {
@@ -1547,10 +1547,10 @@ index ef71a1feb3..c46a08a520 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
index 97040528a0..9898fab280 100644
index 761cd1355b..cb3363a01e 100644
--- a/src/main/java/net/minecraft/server/PlayerChunk.java
+++ b/src/main/java/net/minecraft/server/PlayerChunk.java
@@ -146,6 +146,9 @@ public class PlayerChunk {
@@ -150,6 +150,9 @@ public class PlayerChunk {
}
public void a(Chunk chunk) {
@@ -1561,10 +1561,10 @@ index 97040528a0..9898fab280 100644
World world = chunk.getWorld();
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 89649e73e5..18ab79c7e3 100644
index 8e16d6ac87..210a7e8206 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -493,7 +493,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -491,7 +491,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
PlayerChunkMap.LOGGER.error("Couldn't load chunk {}", chunkcoordintpair, exception);
}
@@ -1573,7 +1573,7 @@ index 89649e73e5..18ab79c7e3 100644
}, this.executor);
}
@@ -1109,6 +1109,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1111,6 +1111,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
private void a(EntityPlayer entityplayer, Packet<?>[] apacket, Chunk chunk) {
if (apacket[0] == null) {
@@ -1583,7 +1583,7 @@ index 89649e73e5..18ab79c7e3 100644
apacket[1] = new PacketPlayOutLightUpdate(chunk.getPos(), this.lightEngine);
}
diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
index 7f90a617fe..e00d8ab3ef 100644
index 83b36b3e7f..8fef6008d1 100644
--- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
+++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
@@ -207,6 +207,8 @@ public class PlayerInteractManager {
@@ -1651,7 +1651,7 @@ index d2bf158a91..cac427fda7 100644
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
return new TicketType<>(s, comparator, 0L);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e2a3ab0e62..3105353a48 100644
index c8f198fdf0..c30d77be58 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2,6 +2,8 @@ package net.minecraft.server;