Upstream
/
Yatopia
mirror of https://github.com/YatopiaMC/Yatopia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Think once, code twice

This commit is contained in:
tr7zw 2020-02-27 22:17:46 +01:00
parent 1b7d8e5fbe
commit f62172d055
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patches/api/0031-Add-GameProfileLookupEvent.patch
View File

@ -1,12 +1,12 @@
From 47ced83bdada3088015b24b5aab166ab221b5574 Mon Sep 17 00:00:00 2001
From cca27c924d81ceff7c064f57913f33e11331e080 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 22:21:14 +0100
Subject: [PATCH] Add GameProfileLookupEvent
---
pom.xml | 11 +++++++
.../yapfa/events/GameProfileLookupEvent.java | 30 +++++++++++++++++++
2 files changed, 41 insertions(+)
pom.xml | 11 +++++
.../yapfa/events/GameProfileLookupEvent.java | 45 +++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java
diff --git a/pom.xml b/pom.xml
@ -40,12 +40,14 @@ index ca897873..3f97b2be 100644
<artifactId>fastutil</artifactId>
diff --git a/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java
new file mode 100644
index 00000000..7a15e623
index 00000000..78bb8e58
--- /dev/null
+++ b/src/main/java/de/tr7zw/yapfa/events/GameProfileLookupEvent.java
@@ -0,0 +1,30 @@
@@ -0,0 +1,45 @@
+package de.tr7zw.yapfa.events;
+
+import java.util.UUID;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
@ -54,9 +56,14 @@ index 00000000..7a15e623
+public class GameProfileLookupEvent extends Event {
+ private static final HandlerList handlers = new HandlerList();
+ private GameProfile gameProfile = null;
+ private final UUID uuid;
+ private final String name;
+
+ public GameProfileLookupEvent() {
+ }
+ public GameProfileLookupEvent(UUID uuid, String name) {
+ super();
+ this.uuid = uuid;
+ this.name = name;
+ }
+
+ public GameProfile getGameProfile() {
+ return gameProfile;
@ -66,6 +73,14 @@ index 00000000..7a15e623
+ this.gameProfile = gameProfile;
+ }
+
+ public UUID getUuid() {
+ return uuid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public HandlerList getHandlers() {
+ return handlers;
+ }

10
patches/server/0040-Add-GameProfileLookupEvent.patch
View File

@ -1,4 +1,4 @@
From ea16ce73c54cdf9dbbe01fda1fe31bf4066ef429 Mon Sep 17 00:00:00 2001
From 34ab733aef834e541424baa5e8b985d71be880f4 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Wed, 26 Feb 2020 22:22:02 +0100
Subject: [PATCH] Add GameProfileLookupEvent
@ -9,7 +9,7 @@ Subject: [PATCH] Add GameProfileLookupEvent
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
index b151a13c..1d8e9fdf 100644
index b151a13c..502f8a20 100644
--- a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
+++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
@@ -5,8 +5,12 @@ import com.google.common.base.Charsets;
@ -34,7 +34,7 @@ index b151a13c..1d8e9fdf 100644
- this.profile = result;
- }
+ // YAPFA start
+ GameProfileLookupEvent event = new GameProfileLookupEvent();
+ GameProfileLookupEvent event = new GameProfileLookupEvent(profile.getId(), profile.getName());
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.getGameProfile() != null) {
+ this.profile = event.getGameProfile();
@ -49,7 +49,7 @@ index b151a13c..1d8e9fdf 100644
return profile.isComplete() && (!isOnlineMode || !textures || hasTextures());
}
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
index 0882d82c..7e0836f8 100644
index 0882d82c..270533c2 100644
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
+++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
@@ -4,9 +4,14 @@ import com.google.common.collect.Iterables;
@ -73,7 +73,7 @@ index 0882d82c..7e0836f8 100644
{
- profile = TileEntitySkull.sessionService.fillProfileProperties( profile, true );
+ // YAPFA start
+ GameProfileLookupEvent event = new GameProfileLookupEvent();
+ GameProfileLookupEvent event = new GameProfileLookupEvent(profile.getId(), profile.getName());
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.getGameProfile() != null) {
+ profile = event.getGameProfile();