Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-20 13:30:05 +01:00
Code Issues Projekte Releases Wiki Aktivität

Improve code formatting

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2020-07-01 14:17:48 +10:00
Ursprung 008f039f37
Commit 3b9cf0f803
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: E8E901AC7C617C11
5 geänderte Dateien mit 5 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
nms-patches/BlockFireAbstract.patch
Datei anzeigen

@ -22,7 +22,7 @@
if (!iblockdata1.a(iblockdata.getBlock())) { if (!iblockdata1.a(iblockdata.getBlock())) {
- if (world.getDimensionKey() != World.OVERWORLD && world.getDimensionKey() != World.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) { - if (world.getDimensionKey() != World.OVERWORLD && world.getDimensionKey() != World.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) {
+ // CraftBukkit - getTypeKey() + // CraftBukkit - getTypeKey()
+ if (world.getTypeKey()!= DimensionManager.OVERWORLD && world.getTypeKey()!= DimensionManager.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) { + if (world.getTypeKey() != DimensionManager.OVERWORLD && world.getTypeKey() != DimensionManager.THE_NETHER || !BlockPortal.a((GeneratorAccess) world, blockposition)) {
if (!iblockdata.canPlace(world, blockposition)) { if (!iblockdata.canPlace(world, blockposition)) {
- world.a(blockposition, false); - world.a(blockposition, false);
+ fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke + fireExtinguished(world, blockposition); // CraftBukkit - fuel block broke

2
nms-patches/EntityZombie.patch
Datei anzeigen

@ -56,7 +56,7 @@
entityzombie.u(entityzombie.world.getDamageScaler(entityzombie.getChunkCoordinates()).d()); entityzombie.u(entityzombie.world.getDamageScaler(entityzombie.getChunkCoordinates()).d());
entityzombie.u(entityzombie.eL() && this.eV()); entityzombie.u(entityzombie.eL() && this.eV());
} }
+ else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // SPIGOT-5208: End conversion to stop event spam + else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // CraftBukkit - SPIGOT-5208: End conversion to stop event spam
} }

1
src/main/java/com/mojang/brigadier/tree/CommandNode.java
Datei anzeigen

@ -1,5 +1,6 @@
package com.mojang.brigadier.tree; package com.mojang.brigadier.tree;
// CHECKSTYLE:OFF
import com.google.common.collect.ComparisonChain; import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

2
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
Datei anzeigen

@ -1530,7 +1530,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
break; break;
} }
} }
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> {}); AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });
dummy.setValue(scaledHealth ? healthScale : getMaxHealth()); dummy.setValue(scaledHealth ? healthScale : getMaxHealth());
collection.add(dummy); collection.add(dummy);
} }

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftSmithingRecipe.java
Datei anzeigen

@ -24,6 +24,6 @@ public class CraftSmithingRecipe extends SmithingRecipe implements CraftRecipe {
public void addToCraftingManager() { public void addToCraftingManager() {
ItemStack result = this.getResult(); ItemStack result = this.getResult();
MinecraftServer.getServer().getCraftingManager().addRecipe(new net.minecraft.server.RecipeSmithing(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result))); MinecraftServer.getServer().getCraftingManager().addRecipe(new net.minecraft.server.RecipeSmithing(CraftNamespacedKey.toMinecraft(this.getKey()), toNMS(this.getBase(), true), toNMS(this.getAddition(), true), CraftItemStack.asNMSCopy(result)));
} }
} }