[ci skip] Add more identifying patch comments
This commit is contained in:
@@ -21,6 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @return whether the block will drop items
|
||||
+ */
|
||||
+ boolean isValidTool(@NotNull ItemStack itemStack);
|
||||
// Paper End
|
||||
// Paper end
|
||||
|
||||
/**
|
||||
|
||||
@@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ float getYaw();
|
||||
// Paper end
|
||||
|
||||
// Paper Start - Collision API
|
||||
// Paper start - Collision API
|
||||
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
|
||||
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
return blockLoc;
|
||||
}
|
||||
+
|
||||
+ // Paper Start
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * @return The block key for this location's block location.
|
||||
+ * @see Block#getBlockKey(int, int, int)
|
||||
@@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ public long toBlockKey() {
|
||||
+ return Block.getBlockKey(getBlockX(), getBlockY(), getBlockZ());
|
||||
+ }
|
||||
+ // Paper End
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* @return A new location where X/Y/Z are the center of the block
|
||||
@@ -103,7 +103,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
*/
|
||||
int getZ();
|
||||
|
||||
+ // Paper Start
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Returns this block's coordinates packed into a long value.
|
||||
+ * Computed via: {@code Block.getBlockKey(this.getX(), this.getY(), this.getZ())}
|
||||
@@ -177,7 +177,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ public static int getBlockKeyZ(long packed) {
|
||||
+ return (int) ((packed << 10) >> 37);
|
||||
+ }
|
||||
+ // Paper End
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Gets the Location of the block
|
||||
|
||||
@@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
boolean isInPowderedSnow();
|
||||
// Paper end
|
||||
+
|
||||
+ // Paper Start - Collision API
|
||||
+ // Paper start - Collision API
|
||||
+ /**
|
||||
+ * Checks for any collisions with the entity's bounding box at the provided location.
|
||||
+ * This will check for any colliding entities (boats, shulkers) / worldborder / blocks.
|
||||
@@ -53,5 +53,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @return collides or not
|
||||
+ */
|
||||
+ boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
|
||||
+ // Paper End - Collision API
|
||||
+ // Paper end - Collision API
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
default org.bukkit.Location getSourceLoc() {
|
||||
return this.getOrigin();
|
||||
}
|
||||
+ // Paper Start - Auto expire setting
|
||||
+ // Paper start - Auto expire setting
|
||||
+ /**
|
||||
+ * Sets if this falling block should expire after:
|
||||
+ * - 30 seconds
|
||||
@@ -104,5 +104,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @param autoExpires if this behavior should occur
|
||||
+ */
|
||||
+ void shouldAutoExpire(boolean autoExpires);
|
||||
+ // Paper End - Auto expire setting
|
||||
+ // Paper end - Auto expire setting
|
||||
}
|
||||
|
||||
@@ -775,7 +775,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
|
||||
// Paper End - Collision API
|
||||
// Paper end - Collision API
|
||||
+
|
||||
+ // Paper start - Folia schedulers
|
||||
+ /**
|
||||
|
||||
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
*/
|
||||
boolean isFrozen();
|
||||
|
||||
+ // Paper Start - Freeze Tick Lock API
|
||||
+ // Paper start - Freeze Tick Lock API
|
||||
+ /**
|
||||
+ * Gets if the entity currently has its freeze ticks locked
|
||||
+ * to a set amount.
|
||||
@@ -30,7 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @param locked prevent vanilla modification or not
|
||||
+ */
|
||||
+ void lockFreezeTicks(boolean locked);
|
||||
+ // Paper End - Freeze Tick Lock API
|
||||
+ // Paper end - Freeze Tick Lock API
|
||||
+
|
||||
/**
|
||||
* Mark the entity's removal.
|
||||
|
||||
@@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
@Nullable
|
||||
public UUID getThrower();
|
||||
+
|
||||
+ // Paper Start
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Gets if non-player entities can pick this Item up
|
||||
+ *
|
||||
|
||||
@@ -318,7 +318,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
}
|
||||
}
|
||||
+
|
||||
+ // Paper Start - More cat api
|
||||
+ // Paper start - More cat api
|
||||
+ /**
|
||||
+ * Sets if the cat is lying down.
|
||||
+ * This is visual and does not affect the behaviour of the cat.
|
||||
@@ -348,7 +348,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @return head is up
|
||||
+ */
|
||||
+ public boolean isHeadUp();
|
||||
+ // Paper End - More cat api
|
||||
+ // Paper end - More cat api
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Chicken.java b/src/main/java/org/bukkit/entity/Chicken.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
|
||||
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
return remaining;
|
||||
}
|
||||
|
||||
+ // Paper Start
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Set if the item will fly at the player
|
||||
+ * <p>Cancelling the event will set this value to false.</p>
|
||||
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ public boolean getFlyAtPlayer() {
|
||||
+ return flyAtPlayer;
|
||||
+ }
|
||||
+ // Paper End
|
||||
+ // Paper end
|
||||
+
|
||||
@Override
|
||||
public boolean isCancelled() {
|
||||
|
||||
@@ -12,7 +12,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
*/
|
||||
void setArrowsInBody(int count, boolean fireEvent); // Paper
|
||||
|
||||
+ // Paper Start - Bee Stinger API
|
||||
+ // Paper start - Bee Stinger API
|
||||
+ /**
|
||||
+ * Gets the time in ticks until the next bee stinger leaves the entity's body.
|
||||
+ *
|
||||
@@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ * @param count amount of bee stingers in entity's body
|
||||
+ */
|
||||
+ public void setBeeStingersInBody(int count);
|
||||
+ // Paper End - Stinger API
|
||||
+ // Paper end - Stinger API
|
||||
+
|
||||
/**
|
||||
* Returns the living entity's current maximum no damage ticks.
|
||||
|
||||
Reference in New Issue
Block a user