Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
3148b25b1 [CI-SKIP] [Auto] Rebuild Patches
880a910a9 Properly track block update flags (actually fixes #5038)
ace3146df Fix debug stick update suppression (Fixes #5038)
bb4247f86 Fix dumpitem command not checking sender (#5025)
b72a74e48 nerf nether search radius config (#4781)
This commit is contained in:
jmp
2021-01-11 12:48:40 -08:00
parent e126e38336
commit 885092f773
25 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -575,10 +575,10 @@ index dee00aac05f1acf050f05d4db557a08dd0f301c8..52c0ab1ce46e1f3233ef746d9bc69935
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf93580c52 100644
index 0abfe19e204d20af0f8dedbeedb0ef98dfe9d3c8..1a876336384198bad2a25c018be5f2418027dd47 100644
--- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
@@ -182,6 +182,44 @@ public class PaperCommand extends Command {
@@ -186,6 +186,44 @@ public class PaperCommand extends Command {
}
}
@@ -623,7 +623,7 @@ index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf
private void doFixLight(CommandSender sender, String[] args) {
if (!(sender instanceof Player)) {
sender.sendMessage("Only players can use this command");
@@ -190,7 +228,7 @@ public class PaperCommand extends Command {
@@ -194,7 +232,7 @@ public class PaperCommand extends Command {
int radius = 2;
if (args.length > 1) {
try {
@@ -632,7 +632,7 @@ index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf
} catch (Exception e) {
sender.sendMessage("Not a number");
return;
@@ -203,6 +241,13 @@ public class PaperCommand extends Command {
@@ -207,6 +245,13 @@ public class PaperCommand extends Command {
net.minecraft.server.WorldServer world = (WorldServer) handle.world;
LightEngineThreaded lightengine = world.getChunkProvider().getLightEngine();
@@ -9634,7 +9634,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d82549d9f56f4 100644
index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c209f3329 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -10029,7 +10029,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
return false;
}
@@ -2843,7 +3086,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2849,7 +3092,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.cp().forEach((entity) -> {
worldserver.chunkCheck(entity);
entity.az = true;
@@ -10038,7 +10038,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
while (iterator.hasNext()) {
Entity entity1 = (Entity) iterator.next();
@@ -3301,12 +3544,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3307,12 +3550,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.locBlock;
}
@@ -10055,7 +10055,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
}
public void setMot(double d0, double d1, double d2) {
@@ -3361,7 +3608,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3367,7 +3614,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// Paper end
if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -15191,7 +15191,7 @@ index 5d9d58411f2fad9d5da703f964d269b4a7c2b205..f0fdfd6891e59891e7370a2d682b65c6
private double c;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b6342fb554e 100644
index 02303f00e243748b9d1c4a37719fcf5c8d271ed9..28ee325fcc8b50397768363403823f2e3391d8c8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -15267,7 +15267,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
// CraftBukkit start - tree generation
if (this.captureTreeGeneration) {
// Paper start
@@ -460,6 +501,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -461,6 +502,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
// CraftBukkit start - Split off from above in order to directly send client and physic updates
public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i, int j) {
@@ -15275,7 +15275,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
IBlockData iblockdata = newBlock;
IBlockData iblockdata1 = oldBlock;
IBlockData iblockdata2 = actualBlock;
@@ -895,6 +937,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -896,6 +938,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return;
// Paper end
}
@@ -15283,7 +15283,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
}
// Paper start - Prevent armor stands from doing entity lookups
@Override
@@ -1078,10 +1121,44 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1079,10 +1122,44 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return this.getChunkAt(i, j, ChunkStatus.FULL, false);
}
@@ -15329,7 +15329,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
int i = MathHelper.floor((axisalignedbb.minX - 2.0D) / 16.0D);
int j = MathHelper.floor((axisalignedbb.maxX + 2.0D) / 16.0D);
int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D);
@@ -1137,7 +1214,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1138,7 +1215,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
Chunk chunk = (Chunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
if (chunk != null) {
@@ -15338,7 +15338,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
}
}
}
@@ -1160,7 +1237,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1161,7 +1238,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
Chunk chunk = (Chunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
if (chunk != null) {
@@ -15347,7 +15347,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
}
}
}
@@ -1168,6 +1245,106 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -1169,6 +1246,106 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return list;
}