Allow plugins to replace texture if already set on skulls
This commit is contained in:
parent
72c26039eb
commit
ecc9347238
15 changed files with 50 additions and 48 deletions
|
@ -1,4 +1,4 @@
|
|||
From 55825618b563b55754e6cb59645db8fb55391831 Mon Sep 17 00:00:00 2001
|
||||
From 41ab68c2065785eadb3187c52f0f1711df713537 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Fri, 24 Mar 2017 23:56:01 -0500
|
||||
Subject: [PATCH] Paper Metrics
|
||||
|
@ -691,5 +691,5 @@ index 1b5158c0d..9ce3e1365 100644
|
|||
|
||||
static void readConfig(Class<?> clazz, Object instance)
|
||||
--
|
||||
2.14.1
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ef3107eb89bc63806994147d6f0ad1c5def5162f Mon Sep 17 00:00:00 2001
|
||||
From 657fd80d2b490c68d3d640f155f8ea627edca61f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 28 Mar 2016 20:55:47 -0400
|
||||
Subject: [PATCH] MC Utils
|
||||
|
@ -349,5 +349,5 @@ index 8cede938a..cd2d58bfb 100644
|
|||
return System.nanoTime() / 1000000L;
|
||||
}
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b3c4c79a1b1793ea484e2576151940ee6de01328 Mon Sep 17 00:00:00 2001
|
||||
From 80656c9b210ef9a23038323e4c282b5d8d97a457 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 3 Mar 2016 04:00:11 -0600
|
||||
Subject: [PATCH] Timings v2
|
||||
|
@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 7861a759da2fec72229a685817cd2e0efdf916cb Mon Sep 17 00:00:00 2001
|
||||
From 0aa1b77dd406ea71f2a15b5bb1cdb479e5f2a13b Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:02:51 -0600
|
||||
Subject: [PATCH] Configurable cactus and reed natural growth heights
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 621bf705..4a692ac1 100644
|
||||
index 621bf7051..4a692ac1b 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -63,4 +63,13 @@ public class PaperWorldConfig {
|
||||
|
@ -23,7 +23,7 @@ index 621bf705..4a692ac1 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
index 64b7d08f..d8fb87f7 100644
|
||||
index 64b7d08fa..d8fb87f7a 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
|
||||
@@ -28,7 +28,7 @@ public class BlockCactus extends Block {
|
||||
|
@ -36,7 +36,7 @@ index 64b7d08f..d8fb87f7 100644
|
|||
|
||||
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
|
||||
index 57f24f55..d19dce83 100644
|
||||
index 57f24f55d..d19dce839 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockReed.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockReed.java
|
||||
@@ -28,7 +28,7 @@ public class BlockReed extends Block {
|
||||
|
@ -49,5 +49,5 @@ index 57f24f55..d19dce83 100644
|
|||
|
||||
if (j >= (byte) range(3, ((100.0F / world.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 44b326120889fe804c445ea78a23b9e5dfa5b050 Mon Sep 17 00:00:00 2001
|
||||
From 12d1cdf6353a40f0870d48ccc90a0d216a2b6917 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:09:16 -0600
|
||||
Subject: [PATCH] Configurable baby zombie movement speed
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 4a692ac1..d44cacc7 100644
|
||||
index 4a692ac1b..d44cacc7e 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -72,4 +72,10 @@ public class PaperWorldConfig {
|
||||
|
@ -20,7 +20,7 @@ index 4a692ac1..d44cacc7 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
index 11c0f24f..277f1414 100644
|
||||
index 11c0f24f1..277f1414a 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityZombie.java
|
||||
@@ -16,7 +16,7 @@ public class EntityZombie extends EntityMonster {
|
||||
|
@ -45,5 +45,5 @@ index 11c0f24f..277f1414 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 9980c5d3448b67ab839e76f49a17c970d55c23ff Mon Sep 17 00:00:00 2001
|
||||
From 614207770d336f0b8fa2db0de7a5bb42ce6d76df Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:14:11 -0600
|
||||
Subject: [PATCH] Configurable fishing time ranges
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index d44cacc7..45bddf3f 100644
|
||||
index d44cacc7e..45bddf3f4 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -78,4 +78,12 @@ public class PaperWorldConfig {
|
||||
|
@ -22,7 +22,7 @@ index d44cacc7..45bddf3f 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
index b4d3bcb4..339d1f1b 100644
|
||||
index b4d3bcb41..339d1f1b1 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
|
||||
@@ -381,7 +381,7 @@ public class EntityFishingHook extends Entity {
|
||||
|
@ -35,5 +35,5 @@ index b4d3bcb4..339d1f1b 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 9c02dc7968f42b1d0a021055f6d72c5d074eeb48 Mon Sep 17 00:00:00 2001
|
||||
From 82899d1f9c3451994851342b7f27d37fc03b9a0f Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 13:24:16 -0600
|
||||
Subject: [PATCH] Allow nerfed mobs to jump
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 45bddf3f..1d9dd0e0 100644
|
||||
index 45bddf3f4..1d9dd0e0b 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -86,4 +86,9 @@ public class PaperWorldConfig {
|
||||
|
@ -19,7 +19,7 @@ index 45bddf3f..1d9dd0e0 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/ControllerJump.java b/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
index 4f2fa59a..8af52a61 100644
|
||||
index 4f2fa59ac..8af52a61f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
+++ b/src/main/java/net/minecraft/server/ControllerJump.java
|
||||
@@ -13,6 +13,7 @@ public class ControllerJump {
|
||||
|
@ -31,7 +31,7 @@ index 4f2fa59a..8af52a61 100644
|
|||
this.b.l(this.a);
|
||||
this.a = false;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
index 3c48d946..7b02b253 100644
|
||||
index 3c48d9463..7b02b253c 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
||||
@@ -46,6 +46,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
||||
|
@ -56,7 +56,7 @@ index 3c48d946..7b02b253 100644
|
|||
}
|
||||
// Spigot End
|
||||
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
index b3b303b3..fc6c3bf7 100644
|
||||
index b3b303b3b..fc6c3bf71 100644
|
||||
--- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
+++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
|
||||
@@ -6,6 +6,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
|
||||
|
@ -81,5 +81,5 @@ index b3b303b3..fc6c3bf7 100644
|
|||
if (this.a.getRandom().nextFloat() < 0.8F) {
|
||||
this.a.getControllerJump().a();
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 85d97e725560acd28f08c4398f9bd16ccc66ec7a Mon Sep 17 00:00:00 2001
|
||||
From 57f3356c54cd1823745adc773f6920584bfe4c10 Mon Sep 17 00:00:00 2001
|
||||
From: Byteflux <byte@byteflux.net>
|
||||
Date: Tue, 1 Mar 2016 14:27:13 -0600
|
||||
Subject: [PATCH] Configurable speed for water flowing over lava
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 4da84671..d3484489 100644
|
||||
index 4da846719..d3484489b 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -123,4 +123,10 @@ public class PaperWorldConfig {
|
||||
|
@ -20,7 +20,7 @@ index 4da84671..d3484489 100644
|
|||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
|
||||
index 7b74df5b..62234a7c 100644
|
||||
index 7b74df5b9..62234a7c9 100644
|
||||
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
|
||||
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
|
||||
@@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
|
||||
|
@ -57,5 +57,5 @@ index 7b74df5b..62234a7c 100644
|
|||
+ }
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 7c7f7211d71e8292dda5a79d6552aca44e33a70f Mon Sep 17 00:00:00 2001
|
||||
From 8e05f591df18b178787bbc1417a67f3685f03c79 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
||||
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
From 285a7bcc278a1fb6ac0fffd27d49b13a3927365d Mon Sep 17 00:00:00 2001
|
||||
From ab1dd2a1c753c497a9aaad2e079b6675847c1d01 Mon Sep 17 00:00:00 2001
|
||||
From: Techcable <Techcable@outlook.com>
|
||||
Date: Wed, 2 Mar 2016 23:42:37 -0600
|
||||
Subject: [PATCH] Use UserCache for player heads
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
index 8a58615f..987cc9a8 100644
|
||||
index b6b34627a..5659c1c70 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
|
||||
|
@ -16,19 +16,21 @@ index 8a58615f..987cc9a8 100644
|
|||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Material;
|
||||
@@ -141,7 +142,11 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
||||
@@ -141,7 +142,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
||||
if (name == null) {
|
||||
profile = null;
|
||||
} else {
|
||||
- profile = new GameProfile(null, name);
|
||||
+ // Paper start - Use Online Players Skull
|
||||
+ GameProfile newProfile = null;
|
||||
+ EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
|
||||
+ if (profile == null && player != null) profile = player.getProfile();
|
||||
+ if (profile == null) profile = new GameProfile(null, name);
|
||||
+ if (player != null) newProfile = player.getProfile();
|
||||
+ if (newProfile == null) profile = new GameProfile(null, name);
|
||||
+ profile = newProfile;
|
||||
+ // Paper end
|
||||
}
|
||||
|
||||
return true;
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d1693e5d0d5a5f9ac242ae9eaa7ce0d11370fe6d Mon Sep 17 00:00:00 2001
|
||||
From 1440a91b37f0d9bb7939fb889d013a559599bc0b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 28 Apr 2016 00:57:27 -0400
|
||||
Subject: [PATCH] remove null possibility for getServer singleton
|
||||
|
@ -35,5 +35,5 @@ index b6c4d98fd..45d3dbde2 100644
|
|||
// CraftBukkit end
|
||||
}
|
||||
--
|
||||
2.16.1
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 6d9bbac5afa53ccf67c0d239a43d7afec78dcd62 Mon Sep 17 00:00:00 2001
|
||||
From 267814cc56f9f9150950dde6c1f9c9407c3c4243 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 29 Apr 2016 20:02:00 -0400
|
||||
Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
|
||||
|
@ -48,7 +48,7 @@ index 4c6eb6ed1..759dacba7 100644
|
|||
Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||||
index aae2d5786..bce3fca84 100644
|
||||
index 5f92355db..eca4903ed 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1223,6 +1223,7 @@ public abstract class World implements IBlockAccess {
|
||||
|
@ -145,5 +145,5 @@ index 256a13178..5768cd512 100644
|
|||
|
||||
public RenderData() {
|
||||
--
|
||||
2.16.1
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 82da4ef5cf6e0a31cb82050e5fc868706ae9292f Mon Sep 17 00:00:00 2001
|
||||
From 9d7e877321c25b62579877a65df3564f47c7a216 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 17 Jun 2013 01:24:00 -0400
|
||||
Subject: [PATCH] Entity Tracking Improvements
|
||||
|
@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
|
|||
send all passenger/vehicles to the player in the chain.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 06857c483..ef096ef65 100644
|
||||
index 36c9bd418..65cee8cf0 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -53,6 +53,7 @@ public abstract class Entity implements ICommandListener {
|
||||
|
@ -99,5 +99,5 @@ index 759dacba7..efc4c79ab 100644
|
|||
|
||||
}
|
||||
--
|
||||
2.16.1
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From fc959e2e4dd778595b3aa4e546534a83c9e8cf18 Mon Sep 17 00:00:00 2001
|
||||
From 2477f11f28b1989f3546d74aab20b09306c8a168 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 17 Jun 2017 17:00:32 -0400
|
||||
Subject: [PATCH] Profile Lookup Events
|
||||
|
@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 288d6c1e779c03b9845da8c3464858eba2c19ec3 Mon Sep 17 00:00:00 2001
|
||||
From caba0410ebdde4384bfc6807a048c9fdf87401b7 Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sat, 22 Jul 2017 15:22:59 +0100
|
||||
Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
|
||||
|
@ -24,5 +24,5 @@ index 737ade74d..c06158e02 100644
|
|||
return result;
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
||||
|
|
Loading…
Reference in a new issue