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

Move all ScriptEngines to Entity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-25 20:15:17 -05:00
parent 4a2d580185
commit 1b9d201bed
8 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/server/0004-Configurable-entity-base-attributes.patch
View File

@@ -4,6 +4,19 @@ Date: Thu, 10 Dec 2020 16:44:54 -0600
Subject: [PATCH] Configurable entity base attributes
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f98f9e295a8e76a95e2afd24b1469a354fe614c5..c5a3f54a590d164ec0f7794f6745ea86753a30d3 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
// CraftBukkit end
public abstract class Entity implements Nameable, EntityAccess, CommandSource, net.minecraft.server.KeyedObject { // Paper
-
+ protected static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur
// CraftBukkit start
private static final int CURRENT_LEVEL = 2;
public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a791660ed 100644
--- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
@@ -1086,18 +1099,10 @@ index dca18730731407bb68ad32852c7994062b0b4ba6..070e1ef31d4dabb943fc57ea4f46bb8d
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index 25ce1910a03947ce070b318f57379f0da5ac5db8..95fd7e0ef552c606eaa75a0e23c0fcbb6d714a72 100644
index 25ce1910a03947ce070b318f57379f0da5ac5db8..7a9654a365a968592d706a13fb46615effcc2399 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -61,6 +61,7 @@ import org.bukkit.event.entity.SlimeSplitEvent;
public class Slime extends Mob implements Enemy {
private static final EntityDataAccessor<Integer> ID_SIZE = SynchedEntityData.defineId(Slime.class, EntityDataSerializers.INT);
+ private static javax.script.ScriptEngine scriptEngine = new javax.script.ScriptEngineManager().getEngineByName("rhino"); // Purpur
public static final int MIN_SIZE = 1;
public static final int MAX_SIZE = 127;
public float targetSquish;
@@ -101,6 +102,30 @@ public class Slime extends Mob implements Enemy {
@@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy {
}
return true; // do not jump() in wasd controller, let vanilla controller handle
}
@@ -1128,7 +1133,7 @@ index 25ce1910a03947ce070b318f57379f0da5ac5db8..95fd7e0ef552c606eaa75a0e23c0fcbb
// Purpur end
@Override
@@ -129,7 +154,7 @@ public class Slime extends Mob implements Enemy {
@@ -129,7 +153,7 @@ public class Slime extends Mob implements Enemy {
this.entityData.set(Slime.ID_SIZE, j);
this.reapplyPosition();
this.refreshDimensions();