mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

look ma i'm helping!!!

Browse Source
This commit is contained in:
granny 2023-06-08 17:39:37 -07:00
parent 9f92f4d9bf
commit 11db9467c1
No known key found for this signature in database
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0003-Purpur-client-support.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a5be783b06f97d45897a359db4e2f213343adebc..7ea9ace724fc47694dcdf6f81ce1bc2d72f6320b 100644
index 997afb6739c72529ea8226228a9905d72f77c89a..dbc4ce2bd8b48f6af6f33d75100f089bc110f657 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3072,4 +3072,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3074,4 +3074,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0008-AFK-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 7ea9ace724fc47694dcdf6f81ce1bc2d72f6320b..22cc810ae8acbebfba0a47e27dc9ea587804836c 100644
index dbc4ce2bd8b48f6af6f33d75100f089bc110f657..5a303d33de32ce3c7480ab866703f70d1968b84b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3080,5 +3080,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3082,5 +3082,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0015-Player-invulnerabilities.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 22cc810ae8acbebfba0a47e27dc9ea587804836c..aae142a2222905b45b799f3bd6ee70c6a67a4a10 100644
index 5a303d33de32ce3c7480ab866703f70d1968b84b..4d95ddbba22b7fdadec3cd880fd9acde92b515c3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3099,5 +3099,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3101,5 +3101,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0044-Debug-Marker-API.patch
View File

@ -260,10 +260,10 @@ index d07b6f40c111c9b131f2995e9796d66f5344c5df..adf8169d5baefa7a33c33ef066180a81
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index aae142a2222905b45b799f3bd6ee70c6a67a4a10..9bd89aa586d9f1e9526b9abc470242f4476265c3 100644
index 4d95ddbba22b7fdadec3cd880fd9acde92b515c3..bb62037ea111f27bed78001ec2e179cc69e0084e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3120,5 +3120,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3122,5 +3122,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0045-Add-death-screen-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9bd89aa586d9f1e9526b9abc470242f4476265c3..2242659685fa8589e4201d82afdcc42f2072bfb1 100644
index bb62037ea111f27bed78001ec2e179cc69e0084e..949bacc06d06d90980243dfc14360599a8030e03 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3190,5 +3190,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3192,5 +3192,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

14
patches/todo/server/0251-Option-for-villager-display-trade-item.patch → patches/server/0243-Option-for-villager-display-trade-item.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Option for villager display trade item
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
index 98373e013748817209b811d4adbb40a8787242a6..567b501f4de7556e55e2418d2f5700b4e4265235 100644
index 050be72c815010bf3f4b72427e2052b00420e8ee..5a461afd35b3a88d5717a26874c7732a4ec5027e 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShowTradesToPlayer.java
@@ -42,6 +42,7 @@ public class ShowTradesToPlayer extends Behavior<Villager> {
@ -17,22 +17,22 @@ index 98373e013748817209b811d4adbb40a8787242a6..567b501f4de7556e55e2418d2f5700b4
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3a85206129ecd9570bdfb5453c57dc8fac618587..82d04c5f4705de059507c7633ab276a79152b6b5 100644
index 7f7f8028d6658107d63cfcd8c713c851d6d8a709..615af0798cb2931d380378bb1ea4918b0b66d206 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2712,6 +2712,7 @@ public class PurpurWorldConfig {
@@ -2292,6 +2292,7 @@ public class PurpurWorldConfig {
public int villagerMinimumDemand = 0;
public boolean villagerLobotomizeEnabled = false;
public int villagerLobotomizeCheckInterval = 100;
+ public boolean villagerDisplayTradeItem = true;
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2744,6 +2745,7 @@ public class PurpurWorldConfig {
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.villager.attributes.max-health", villagerMaxHealth);
@@ -2319,6 +2320,7 @@ public class PurpurWorldConfig {
}
villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled);
villagerLobotomizeCheckInterval = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheckInterval);
+ villagerDisplayTradeItem = getBoolean("mobs.villager.display-trade-item", villagerDisplayTradeItem);
}
public boolean vindicatorRidable = false;
public double vindicatorMaxHealth = 24.0D;