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

Silk spawners now NBT based, lore only for display

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-19 04:50:30 -05:00
parent 0554ce8234
commit b153699691
3 changed files with 109 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 752ca48604bb36245438910284ff165e3ac6ee4e Mon Sep 17 00:00:00 2001
From 3ad2b56f69e8fe52b9820dd5366d30389a202651 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -30,13 +30,13 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntitySnowman.java | 1 +
.../net/minecraft/server/EntitySquid.java | 46 +++++++++++
.../server/EntityTameableAnimal.java | 6 ++
.../net/minecraft/server/EntityTypes.java | 6 ++
.../net/minecraft/server/EntityTypes.java | 4 +
.../purpur/controller/ControllerLookWASD.java | 74 ++++++++++++++++++
.../purpur/controller/ControllerMoveWASD.java | 77 +++++++++++++++++++
.../controller/ControllerMoveWASDFlying.java | 58 ++++++++++++++
.../controller/ControllerMoveWASDWater.java | 42 ++++++++++
.../craftbukkit/entity/CraftLivingEntity.java | 10 +++
32 files changed, 562 insertions(+), 72 deletions(-)
32 files changed, 560 insertions(+), 72 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -956,22 +956,20 @@ index 70bf06b94..2f41d8ade 100644
this.setTamed(true);
this.setOwnerUUID(entityhuman.getUniqueID());
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index 77d4bbce1..73116e48f 100644
index fb0c6bce0..4979f77b7 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -255,6 +255,12 @@ public class EntityTypes<T extends Entity> {
return this.ba;
@@ -262,6 +262,10 @@ public class EntityTypes<T extends Entity> {
}
+ // Purpur start
// Purpur start
+ public String getName() {
+ return IRegistry.ENTITY_TYPE.getKey(this).getKey();
+ }
+ // Purpur end
+
public String e() {
if (this.be == null) {
this.be = SystemUtils.a("entity", IRegistry.ENTITY_TYPE.getKey(this));
public String getTranslatedName() {
return getNameComponent().getString();
}
diff --git a/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java b/src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
new file mode 100644
index 000000000..99e184d36