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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@27516ee Temp fix for EntityType.translationKey
PaperMC/Paper@8fced9d [ci skip] Update paperweight to 1.5.1 (#8856)
PaperMC/Paper@f9dc371 Fix calling UnknownCommandEvent (#8232)
This commit is contained in:
granny
2023-02-17 03:20:27 -08:00
parent fccccfa194
commit 41593baf70
19 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0279-Remove-Mojang-Profiler.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c42824ef9d 100644
index 3501c04a9dd745b56d701bc20e18ead4add726f5..71fe34621178af4ae9e9aa0ee945c235f69ba7be 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -144,7 +144,7 @@ public class Commands {
@@ -145,7 +145,7 @@ public class Commands {
CloneCommands.register(this.dispatcher, commandRegistryAccess);
DataCommands.register(this.dispatcher);
DataPackCommand.register(this.dispatcher);
@@ -17,7 +17,7 @@ index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c4
DefaultGameModeCommands.register(this.dispatcher);
DifficultyCommand.register(this.dispatcher);
EffectCommands.register(this.dispatcher, commandRegistryAccess);
@@ -306,9 +306,9 @@ public class Commands {
@@ -309,9 +309,9 @@ public class Commands {
public int performCommand(ParseResults<CommandSourceStack> parseresults, String s, String label) { // CraftBukkit
CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
@@ -29,7 +29,7 @@ index 244f5b5a7a7e781c27d21477d798f65ff77d4bc6..a6996259f9fcb2d6520ca45fa42b11c4
byte b0;
@@ -371,7 +371,7 @@ public class Commands {
@@ -394,7 +394,7 @@ public class Commands {
b0 = 0;
}
} finally {
@@ -750,7 +750,7 @@ index ece55efcd566bcb9b06d305496ab745807cfe975..b396a329e753f42b3878736b6b14bafd
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 421493a14ac3908d4ae4032e4f19922598206135..48b09b1fe0d316277a46cab700d790a1d35d3fc4 100644
index bec3d455ae3f639fbfda568c2573bacaa1ba7ccd..5822e94dcfb90615a98d4862ffb300a2140aaee7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1184,7 +1184,7 @@ public class ServerPlayer extends Player {
@@ -783,7 +783,7 @@ index 421493a14ac3908d4ae4032e4f19922598206135..48b09b1fe0d316277a46cab700d790a1
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index e57ef9c60163d8ee13547d87169ccd0daec4acd4..731516cc0e7a6a16874b5c9d533f2beb84397e06 100644
index d468bb5e61ba25cfb2b462e2d0852256c64034d6..1cdb800ca42aa2c42feafc07f38b8f6bcecb4f5e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -405,7 +405,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1135,7 +1135,7 @@ index 6409e72cf4c6b8fbd21d1a97610160f604b8dc95..b54cabc765c187cd1788cc61dc271909
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a1ef049460b1b8a257e09b52b7385fc6555f6472..cd538b09f74170306d18fab9b16fd5750e8cc3ed 100644
index b9917a872b6a2231ead62c8a1c4e4eeb79a227ab..4a8f08ceb0f662b4356bbe80fc207e6e8a48c7ad 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -398,7 +398,7 @@ public abstract class LivingEntity extends Entity {
@@ -1246,7 +1246,7 @@ index a1ef049460b1b8a257e09b52b7385fc6555f6472..cd538b09f74170306d18fab9b16fd575
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 535b13206e4a8a68e1fb226b3c44890face3b55f..7bd4e95fcaf3855a4fe412b5898a97d7992caad3 100644
index af1c7af8e750ce62ac07fdce5f6915e997431e8c..43cc8e8f07adecef21c70954918b8945a7c3ef62 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@@ -1483,7 +1483,7 @@ index 183f67a32203b02b43ca3d612f950f288c754eac..867091706521dbb16e66bdf5c9f41367
Optional<Integer> optional = this.getBrain().getMemory(MemoryModuleType.PLAY_DEAD_TICKS);
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index e81b65476a6885b949b96f1d85df652c8cf56d5c..f9d77ad2493b9ba67e8f45ce248d29a8e9ab7b80 100644
index 0ddae1d558316ca7129e51d59d4189fc8dd03c1a..c942f0093e0b88ec8a904698a613c64a8c42bc43 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
@@ -153,13 +153,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider
@@ -1656,7 +1656,7 @@ index 456ebb0829d19d13abe05d83035c4abe3589962f..17df2b09542f67cdd1d83f795d9b2aad
if ((this.tickCount + this.getId()) % 120 == 0) {
Warden.applyDarknessAround(worldserver, this.position(), this, 20);
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index 700d32abc957769960fd081072c941681474f7f0..832469e39901d9ec666ddaf3aff77419f6195b1c 100644
index 1f9a9f535c54481fc16bec5db4111ca1eba409df..aed1d9ccffe471b6c2a1d52d2d3d097f6431318b 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -335,7 +335,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler