Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c8028d1c Fix data version check for ItemStack serialization (#3394)
9254a80a Fix race condition reintroduced in Prioritize class loader patch
6f196fe7 Add Raw Byte ItemStack Serialization
df43f828 Allow server startup for those poor people running <1G Xmx
3c9b65ef Fix cases where no-tick < tick view distance
72f89a07 Workaround for Client Lag Spikes (MC-162253)
3f941c0c Add option for console having all permissions
d2ae4658 Add permission for command blocks
9f8ae5cb Prioritise own classes where possible
74466412 Check portal restrictions when entering end gateways
fc9cf84d Fix NPE when temp ip bans expire (#3373)
16bd420d Add missing mob goals for API (#3367)
b5c4e2f6 Ensure no-tick view is not smaller than ticking VD
52564b1f Expand Pathfinding API with more options
dde65481 Fix usage of vanilla goals
7797aebe Drop Leads from nether portals - Fixes #3226
511b6bc2 Reduce MutableInt and Vec3d allocations, use ArrayDeque
84673141 Optimize NibbleArray to use pooled buffers
897dd2c8 Foundational work for Future Memory usage improvements
bb4002d8 Handle CraftPlayer#setSpectatorTarget better
4ae08959 Fix collision checks on spawning hanging entities and null on async chunk loads
c2f8d1ef Protect Bedrock and End Portal/Frames from being destroyed
827cc632 Updated Upstream (Bukkit/CraftBukkit/Spigot)
92f680ed Fix Pathfinding and obscure glitchy buggy 0 tick farms
7a7c4292 Optimize Pathfinder - Remove Streams / Optimized collections
fc917d16 Optimize Hoppers - Major performance improvement
14ad77c6 Fix PotionEffect API Ignoring Icon bug
eb3ce8a2 Fix EntityRaider picking up items when they shouldn't be able
1ea9ada0 Add a TELEPORT ticket when changing dimensions
8e9459ea Fix missing flag pass for isUrgent
7befec44 Potential bed api (#3339)
27945a6b Optimize WorldBorder collision checks and air
55e17a85 Wait for Async Tasks during shutdown
b5905256 Ensure Entity AABB's are never invalid
a054aa6f Properly remove Entities from current chunk
c894ddfd Fix teleporting onto a chunk line
57d6cc01 Send LOGIN protocol packets immediately - Fix disconnect during async prelogin
cd93e54d Don't use our modified chunk checks for collision in world gen
b4003ef1 Allow loading entities current chunk if needed to fix collision checks
e5f64896 Add Urgent API for Async Chunks API and use it for Async Teleport
ad8e59dc Ensure chunks loaded on respawn for suffocation check
  • Loading branch information
BillyGalbreath committed May 18, 2020
1 parent 9c87f57 commit 860c861
Show file tree
Hide file tree
Showing 49 changed files with 207 additions and 207 deletions.
2 changes: 1 addition & 1 deletion Paper
Submodule Paper updated 127 files
2 changes: 1 addition & 1 deletion current-paper
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.15.2--4855e238ccb7ca42732659de5fa77da1264a62d9
1.15.2--0c6830d7565eff99b423b84111c1159be356df13
14 changes: 7 additions & 7 deletions patches/api/0004-Ridables.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 4bca53682d571ec4fcd1b4dc823ba12f23fef801 Mon Sep 17 00:00:00 2001
From 282ffe28105fdbbbaa9ca8efc1184d83f5f47dee 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] Ridables
Expand All @@ -11,10 +11,10 @@ Subject: [PATCH] Ridables
create mode 100644 src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java

diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index dc60d945..751b9a5e 100644
index d23ad96ee..36d37e9a3 100644
--- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -138,6 +138,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -154,6 +154,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
GoalKey<Mob> FOLLOW_ENTITY = GoalKey.of(Mob.class, NamespacedKey.minecraft("follow_entity"));
GoalKey<Tameable> FOLLOW_OWNER = GoalKey.of(Tameable.class, NamespacedKey.minecraft("follow_owner"));
GoalKey<Animals> FOLLOW_PARENT = GoalKey.of(Animals.class, NamespacedKey.minecraft("follow_parent"));
Expand All @@ -27,7 +27,7 @@ index dc60d945..751b9a5e 100644
GoalKey<Mob> INTERACT = GoalKey.of(Mob.class, NamespacedKey.minecraft("interact"));
diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
new file mode 100644
index 00000000..c0ec5a13
index 000000000..c0ec5a130
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
@@ -0,0 +1,37 @@
Expand Down Expand Up @@ -69,10 +69,10 @@ index 00000000..c0ec5a13
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 5518ecd2..809021b2 100644
index 3f0f38031..25372c58b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -656,4 +656,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -659,4 +659,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@NotNull
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
// Paper end
Expand Down Expand Up @@ -116,5 +116,5 @@ index 5518ecd2..809021b2 100644
+ // Purpur end
}
--
2.26.0.windows.1
2.24.0

6 changes: 3 additions & 3 deletions patches/api/0019-Add-moon-phase-API.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8876f5bd26cacef6a6849fb2c95a5118742c40d3 Mon Sep 17 00:00:00 2001
From 707e74f8dc730b9e1f1ce8183430d5c39af67b64 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API
Expand Down Expand Up @@ -52,10 +52,10 @@ index 000000000..f5ad98c62
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 906ee6827..e5232946e 100644
index 9518da825..cf0d18283 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3273,6 +3273,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3382,6 +3382,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

Expand Down
6 changes: 3 additions & 3 deletions patches/api/0024-Add-getPlacementBlockData-to-World.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 386834e8745191fe5fc0436a6c50a5abeaf588b6 Mon Sep 17 00:00:00 2001
From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)

diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e5232946e..822e06647 100644
index cf0d18283..3a7226cc9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3281,6 +3281,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3390,6 +3390,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0030-Add-ItemStack-convenience-methods.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 78465fa5b6604ac86838560ff7f3ee8e3c0f57ee Mon Sep 17 00:00:00 2001
From c7218d4100f7de38fbfc643e4705908adf1c41bd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 15 Mar 2020 20:52:12 -0500
Subject: [PATCH] Add ItemStack convenience methods
Expand Down Expand Up @@ -50,7 +50,7 @@ index 1f2dbd68c..f2be0d0ce 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index cf8d77491..6895ee55f 100644
index a8ade268c..cdc62301e 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
Expand All @@ -72,7 +72,7 @@ index cf8d77491..6895ee55f 100644

/**
* Represents a stack of items.
@@ -760,4 +772,611 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -783,4 +795,611 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return itemMeta.hasItemFlag(flag);
}
// Paper end
Expand Down
16 changes: 8 additions & 8 deletions patches/server/0001-Rebrand.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2390a607636570bc73eb6a21ddf64e56e7b9bf37 Mon Sep 17 00:00:00 2001
From 11137688efbe226b4c00fd1e9e2a2a0796b0c025 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
Expand All @@ -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 0c0051f7f..6ca410444 100644
index 1ae57e8ab..7f251e739 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
Expand Down Expand Up @@ -75,7 +75,7 @@ index 0c0051f7f..6ca410444 100644
<dependency>
<groupId>net.minecrell</groupId>
<artifactId>terminalconsoleappender</artifactId>
@@ -153,7 +167,7 @@
@@ -159,7 +173,7 @@

<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
Expand All @@ -84,7 +84,7 @@ index 0c0051f7f..6ca410444 100644
<defaultGoal>clean install</defaultGoal> <!-- Paper -->
<plugins>
<plugin>
@@ -161,7 +175,7 @@
@@ -167,7 +181,7 @@
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>
Expand All @@ -107,10 +107,10 @@ 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 1a4bc9043..9c96994f2 100644
index 3ec164785..92677b38b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1555,7 +1555,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}

public String getServerModName() {
Expand Down Expand Up @@ -241,7 +241,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 c2b7cb360..07c96d8a9 100644
index 894917c88..648dde01a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
Expand All @@ -254,7 +254,7 @@ index c2b7cb360..07c96d8a9 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 770375ed4..0e5da2a30 100644
index 549ba4d80..3c7cb4e3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
Expand Down
8 changes: 4 additions & 4 deletions patches/server/0002-Purpur-config-files.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 9d60a1b0e3525b1703db089be68dd6b3a31d48f3 Mon Sep 17 00:00:00 2001
From 376d9b7f6349b16f1f9b7cbf2d7e90c292064826 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
Expand Down Expand Up @@ -62,7 +62,7 @@ index b07c49f1b..cf5abd393 100644
// Paper end

diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 0e6368d0f..352cbe6c0 100644
index 508a3ed1e..d64d7b731 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
Expand Down Expand Up @@ -364,7 +364,7 @@ index 000000000..7d983d9a5
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 07c96d8a9..7f707e689 100644
index 648dde01a..64f1190b0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -815,6 +815,7 @@ public final class CraftServer implements Server {
Expand All @@ -391,7 +391,7 @@ index 07c96d8a9..7f707e689 100644
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");

@@ -2105,6 +2108,18 @@ public final class CraftServer implements Server {
@@ -2134,6 +2137,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}

Expand Down
38 changes: 19 additions & 19 deletions patches/server/0007-Ridables.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From e9e36c5f91db8a630a6e784ddc8f33d8df885405 Mon Sep 17 00:00:00 2001
From a4bd5ae6b15eae7ff3ef922097ac77434a3b26b9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
Expand Down Expand Up @@ -199,7 +199,7 @@ index 816d301f1..f7344d3ae 100644
this.C = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index cd2c18382..418126197 100644
index e0ab058bf..1ef13ee78 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Expand All @@ -208,10 +208,10 @@ index cd2c18382..418126197 100644

- PlayerChunkMap.EntityTracker tracker; // Paper
+ PlayerChunkMap.EntityTracker tracker; public PlayerChunkMap.EntityTracker getTracker() { return tracker; } // Paper // Purpur
boolean collisionLoadChunks = false; // Paper
Throwable addedToWorldStack; // Paper - entity debug
public CraftEntity getBukkitEntity() {
if (bukkitEntity == null) {
@@ -103,7 +103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -104,7 +104,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private int id;
public boolean i; public final boolean blocksEntitySpawning() { return this.i; } // Paper - OBFHELPER
public final List<Entity> passengers;
Expand All @@ -220,7 +220,7 @@ index cd2c18382..418126197 100644
@Nullable
private Entity vehicle;
public boolean attachedToPlayer;
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -137,7 +137,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public double E;
public double F;
public double G;
Expand All @@ -229,7 +229,7 @@ index cd2c18382..418126197 100644
public boolean noclip;
public float J;
protected final Random random;
@@ -180,7 +180,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -181,7 +181,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private boolean aF;
private final double[] aG;
private long aH;
Expand All @@ -238,23 +238,23 @@ index cd2c18382..418126197 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -872,6 +872,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -874,6 +874,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return vec3d1;
}

+ public static double getHorizontalDistanceSqr(Vec3D vec3d) { return b(vec3d); } // Purpur - OBFHELPER
public static double b(Vec3D vec3d) {
return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
}
@@ -1199,6 +1200,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1201,6 +1202,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return flag;
}

+ public boolean isInBubbleColumn() { return l(); } // Purpur - OBFHELPER
private boolean l() {
return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
}
@@ -1212,8 +1214,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1214,8 +1216,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.isInWater() || this.isInRain() || this.l();
}

Expand All @@ -265,15 +265,15 @@ index cd2c18382..418126197 100644
}

public boolean aA() {
@@ -1344,6 +1347,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1346,6 +1349,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.inLava;
}

+ public void moveRelative(float speed, Vec3D motion) { this.a(speed, motion); } // Purpur - OBFHELPER
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);

@@ -2179,7 +2183,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2181,7 +2185,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
this.passengers.add(entity);
}
Expand All @@ -288,7 +288,7 @@ index cd2c18382..418126197 100644
}
return true; // CraftBukkit
}
@@ -2214,6 +2224,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2216,6 +2226,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
Expand All @@ -301,23 +301,23 @@ index cd2c18382..418126197 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2382,6 +2398,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2384,6 +2400,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}

+ public boolean isGlowing() { return bt(); } // Purpur - OBFHELPER
public boolean bt() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2600,6 +2617,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2602,6 +2619,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

public void setHeadRotation(float f) {}

+ public void setBodyYaw(float yaw) { l(yaw); } // Purpur - OBFHELPER
public void l(float f) {}

public boolean bA() {
@@ -3454,4 +3472,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3465,4 +3483,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

void accept(Entity entity, double d0, double d1, double d2);
}
Expand Down Expand Up @@ -3366,7 +3366,7 @@ index 0357c9da9..98a657cec 100644
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 b37301598..6a7a9dc3d 100644
index 62f1e4c5f..a657522cc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Expand Down Expand Up @@ -5227,18 +5227,18 @@ index 0c7f094e5..62a081006 100644
return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 352cbe6c0..4442f5cc0 100644
index d64d7b731..4c04e2120 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -990,6 +990,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -994,6 +994,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
}
}

+ public boolean containsMaterial(AxisAlignedBB aabb, Material mat) { return a(aabb, mat); } // Purpur - OBFHELPER
public boolean a(AxisAlignedBB axisalignedbb, Material material) {
int i = MathHelper.floor(axisalignedbb.minX);
int j = MathHelper.f(axisalignedbb.maxX);
@@ -1625,4 +1626,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1629,4 +1630,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@Override public BiomeManager d() {
return this.biomeManager;
}
Expand Down
Loading

0 comments on commit 860c861

Please sign in to comment.