mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
Add missing obfhelper
This commit is contained in:
William Blake Galbreath
@@ -1,9 +1,10 @@
|
||||
From 4b71f0829824895383493e84d76408f49aaae863 Mon Sep 17 00:00:00 2001
|
||||
From e0eb783eee593cb57e849a4172c487bb1139bf03 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 8 Aug 2019 15:29:15 -0500
|
||||
Subject: [PATCH] Implement AFK API
|
||||
|
||||
---
|
||||
.../java/net/minecraft/server/Entity.java | 1 +
|
||||
.../net/minecraft/server/EntityHuman.java | 9 ++++
|
||||
.../net/minecraft/server/EntityPlayer.java | 43 +++++++++++++++++++
|
||||
.../net/minecraft/server/IEntityAccess.java | 34 ++++++---------
|
||||
@@ -14,10 +15,22 @@ Subject: [PATCH] Implement AFK API
|
||||
.../craftbukkit/entity/CraftPlayer.java | 17 ++++++++
|
||||
.../java/org/spigotmc/ActivationRange.java | 1 +
|
||||
src/main/resources/purpur.lang | 5 ++-
|
||||
10 files changed, 111 insertions(+), 25 deletions(-)
|
||||
11 files changed, 112 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 30bde05b8..b6715862e 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1377,6 +1377,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
return MathHelper.c(f * f + f1 * f1 + f2 * f2);
|
||||
}
|
||||
|
||||
+ public double getDistanceSquared(double x, double y, double z) { return g(x, y, z); } // Purpur - OBFHELPER
|
||||
public double g(double d0, double d1, double d2) {
|
||||
double d3 = this.locX() - d0;
|
||||
double d4 = this.locY() - d1;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index de22cad764..9d26bd1e4c 100644
|
||||
index de22cad76..9d26bd1e4 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -37,7 +50,7 @@ index de22cad764..9d26bd1e4c 100644
|
||||
super(EntityTypes.PLAYER, world);
|
||||
this.bV = ItemStack.a;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index f9a574d115..e4f948b8ae 100644
|
||||
index f9a574d11..e4f948b8a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1617,8 +1617,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -93,7 +106,7 @@ index f9a574d115..e4f948b8ae 100644
|
||||
return this.serverStatisticManager;
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||
index 774ec96f0a..e474ae08a1 100644
|
||||
index 774ec96f0..e474ae08a 100644
|
||||
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||
@@ -116,28 +116,18 @@ public interface IEntityAccess {
|
||||
@@ -138,7 +151,7 @@ index 774ec96f0a..e474ae08a1 100644
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
|
||||
index e1fdee2794..4665671ef6 100644
|
||||
index e1fdee279..4665671ef 100644
|
||||
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
|
||||
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
|
||||
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
|
||||
@@ -158,7 +171,7 @@ index e1fdee2794..4665671ef6 100644
|
||||
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
|
||||
double d4 = d3 * d3;
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index 895e34ed34..f92516069a 100644
|
||||
index 895e34ed3..f92516069 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -223,6 +223,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -193,7 +206,7 @@ index 895e34ed34..f92516069a 100644
|
||||
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 0a8f6ae30f..18f6aedc9c 100644
|
||||
index 0a8f6ae30..18f6aedc9 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -383,7 +383,7 @@ public class WorldServer extends World {
|
||||
@@ -215,7 +228,7 @@ index 0a8f6ae30f..18f6aedc9c 100644
|
||||
} else if (entityplayer.isSleeping()) {
|
||||
++j;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index 84a89d7875..b454d71ac0 100644
|
||||
index 84a89d787..b454d71ac 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -147,6 +147,17 @@ public class PurpurWorldConfig {
|
||||
@@ -237,7 +250,7 @@ index 84a89d7875..b454d71ac0 100644
|
||||
public boolean batRidableInWater = false;
|
||||
public boolean batRequireShiftToMount = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index 60f62f19cb..fa9fc940a2 100644
|
||||
index 60f62f19c..fa9fc940a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2092,4 +2092,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -263,7 +276,7 @@ index 60f62f19cb..fa9fc940a2 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index 6e165a1649..da5fef091a 100644
|
||||
index 6e165a164..da5fef091 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -137,6 +137,7 @@ public class ActivationRange
|
||||
@@ -275,7 +288,7 @@ index 6e165a1649..da5fef091a 100644
|
||||
ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
|
||||
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index 0967ef424b..f4694dbcce 100644
|
||||
index 0967ef424..f4694dbcc 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1 +1,4 @@
|
||||
|
||||
Reference in New Issue
Block a user