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

clear out TODOs

Browse Source
This commit is contained in:
granny
2024-06-16 23:23:54 -07:00
parent 4dca11b02c
commit fa88174bbe
7 changed files with 21 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0001-Rebrand.patch
View File

@@ -184,18 +184,18 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..a6e5950b5875cafd734300cdfbf58f5d
@Override
diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
index 589a8bf75be6ccc59f1e5dd5d8d9afed41c4772d..fea76d9d0b2a75d6a0b39cafafcb11c5a8d7d447 100644
index 589a8bf75be6ccc59f1e5dd5d8d9afed41c4772d..ccdaceb558c310ce1f7cf6b600646e06772fe9d8 100644
--- a/src/main/java/net/minecraft/CrashReport.java
+++ b/src/main/java/net/minecraft/CrashReport.java
@@ -124,7 +124,7 @@ public class CrashReport {
public String getFriendlyReport(ReportType type, List<String> extraInfo) {
StringBuilder stringbuilder = new StringBuilder();
@@ -144,7 +144,7 @@ public class CrashReport {
}
- type.appendHeader(stringbuilder, extraInfo);
+ type.appendHeader(stringbuilder, extraInfo); // Purpur - TODO: 1-21: check later
stringbuilder.append("Time: ");
stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now()));
stringbuilder.append("\n");
public String getFriendlyReport(ReportType type) {
- return this.getFriendlyReport(type, List.of());
+ return this.getFriendlyReport(type, List.of("", "DO NOT REPORT THIS TO PAPER! REPORT TO PURPUR INSTEAD!", "")); // Purpur - Rebrand
}
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
index 4e56018b64d11f76c8da43fd8f85c6de72204e36..9607675e6c5bff2183c4420d11fc63eeb5747fb6 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java
@@ -237,7 +237,7 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 5a04134973dd1db7f778a57ec5f185feec370990..edefef918f2c44e0e8bf94de00e77f773fbb520b 100644
index 8dba6c4a2e1f305cf576e8bfdca5d0c07ab871ae..dcf90f04aec8e703d34357db569141aa3ccae35a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -504,7 +504,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

17
patches/server/0057-Implement-elytra-settings.patch
View File

@@ -45,23 +45,6 @@ index 218f2f085309f04438f8b07bc41cf242583db2dc..ea8e49b42b9dde74784189430be66ed6
if (event.shouldConsume() && !user.hasInfiniteMaterials()) {
itemStack.shrink(1);
} else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 00665c3e81264b440cd27431f7632f3bc2b1ceef..88db87941bfc84bec7a2dcd3c750a854cac72006 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -750,6 +750,12 @@ public final class ItemStack implements DataComponentHolder {
}
this.hurtAndBreak(amount, worldserver, entity, (item) -> { // Paper - Add EntityDamageItemEvent
+ // Purpur start - TODO: 1-21: check later
+ // if (item == Items.ELYTRA) {
+ // setDamageValue(getMaxDamage() - 1);
+ // return;
+ // }
+ // Purpur end
// CraftBukkit start - Check for item breaking
if (this.count == 1 && entity instanceof net.minecraft.world.entity.player.Player) {
org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((net.minecraft.world.entity.player.Player) entity, this);
diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
index f1b2d388a1a40a1d909a2e726f32d6c15e1eb0eb..4934bae61114b49a9f8d0ed044fbb881210df32a 100644
--- a/src/main/java/net/minecraft/world/item/TridentItem.java

6
patches/server/0070-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 71d96fad8cceb9f5699620510b9b8cc4a6fa94f2..3833be24c44c0da3ffcfc1929e2c4a4b2ef40a1b 100644
index 71d96fad8cceb9f5699620510b9b8cc4a6fa94f2..128c0daae941cda386417dfa452e97a9b056441d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -3026,4 +3026,28 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3026,4 +3026,26 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end
@@ -30,8 +30,6 @@ index 71d96fad8cceb9f5699620510b9b8cc4a6fa94f2..3833be24c44c0da3ffcfc1929e2c4a4b
+ if (this.level() == toLevel) {
+ this.connection.internalTeleport(to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch(), java.util.EnumSet.noneOf(net.minecraft.world.entity.RelativeMovement.class));
+ } else {
+ // TODO: 1-21: check later - Paper removed it from "Expand PlayerRespawnEvent, fix passed parameter issues" path
+ //this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH);
+ this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
+ }
+ }

6
patches/server/0110-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 36351e029c55ccd67b460e90f8c74e3d87f8ae5a..70b0d8f18df7380d54a9c28e0d906096
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 98c4acedee3521f115cbc51cbc594e6af28a1912..c23fed2780098e87dd74e7d4cb099678d3bd989a 100644
index 7737c2b5aaa8ad8367915991b75aff00d041efab..a1ef38422631b3856160e054daa14eacb8f13c57 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -302,6 +302,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -68,7 +68,7 @@ index 98c4acedee3521f115cbc51cbc594e6af28a1912..c23fed2780098e87dd74e7d4cb099678
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3058,5 +3061,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3056,5 +3059,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
this.server.getPlayerList().respawn(this, true, RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.DEATH, to);
}
}
@@ -83,7 +83,7 @@ index 98c4acedee3521f115cbc51cbc594e6af28a1912..c23fed2780098e87dd74e7d4cb099678
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fe0f7f6a1b9a4c2b298a0e0d9172fc8f04d16459..a8f8b3da5d1fe661f4c6a2487e81dd6b01653960 100644
index c5d1379a95794ca818e2bd3aee49a2226833d137..ffab1dd057ce003c0c7e6ffd9203833a9d5ffd0e 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -480,6 +480,7 @@ public abstract class PlayerList {

4
patches/server/0142-Config-to-allow-unsafe-enchants.patch
View File

@@ -78,10 +78,10 @@ index 2d300905c05c7c23a4da30b3651b331381a1dc0d..30746b3ae45840206bf23e811a9819f3
((ServerPlayer) this.player).connection.send(new ClientboundContainerSetDataPacket(this.containerId, 0, this.cost.get()));
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 88db87941bfc84bec7a2dcd3c750a854cac72006..c7785f977e64568bca261a34bce712b677ca97c3 100644
index 00665c3e81264b440cd27431f7632f3bc2b1ceef..293771fd6e86447b219d0936b67cdcdf2bc5f0ee 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1255,6 +1255,12 @@ public final class ItemStack implements DataComponentHolder {
@@ -1249,6 +1249,12 @@ public final class ItemStack implements DataComponentHolder {
return !((ItemEnchantments) this.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY)).isEmpty();
}

4
patches/server/0184-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 938f0cc6631e5fdf687f43c1adc850d778227e98..1beb75aa960c766344f00fa898f905d5
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 136635fa74c099e74d75f1d3ca093514329bf3dc..4af01ae458e5a79c20725b22b532710a66ba8f43 100644
index 70103438f70a970dedf5bd4d5e42ae42e310ccea..8d5be2bad86ccec94338b0135d46e5132a824413 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -303,6 +303,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -44,7 +44,7 @@ index 136635fa74c099e74d75f1d3ca093514329bf3dc..4af01ae458e5a79c20725b22b532710a
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -3083,5 +3086,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3081,5 +3084,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}

4
patches/server/0256-Implement-ram-and-rambar-commands.patch
View File

@@ -18,7 +18,7 @@ index 6daecb014fea4e0a4fb00aec28e0ab6779bad9ae..13c084e250f298b2181abebe2c391dc1
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b95044ac3db41f3c4f9404b139ec58eb59d8139e..7cb982a651bd73d0f5763925499107c0e85b1b8f 100644
index 09982bd8a4953b35be059084f8db5a7e581fdc43..d9fbc5c1f4c6317165d8daa104d3d0896b52c240 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -304,6 +304,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -45,7 +45,7 @@ index b95044ac3db41f3c4f9404b139ec58eb59d8139e..7cb982a651bd73d0f5763925499107c0
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -3095,5 +3098,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -3093,5 +3096,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
public void compassBar(boolean compassBar) {
this.compassBar = compassBar;
}