Conflict resolve changes

Moresteck · Jun 29, 2024 · b3e765e · b3e765e
1 parent cd06a6b
commit b3e765e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ A CraftBukkit CB1060 fork for Beta 1.7.3 fixing bugs and adding basic features.<
 Discord (Project Poseidon): https://discord.gg/FwKg676
 
 ## Features (UberBukkit)
+- **Multi version support:** UberBukkit supports b1.0 - b1.7.3 versions.<br> 
+***Experimental*** alpha support is also available.
+
+- **Cracked + Online mode:** You can whitelist cracked players when your server has `online-mode` on.
 
 ## Features (Poseidon)
 - **UUID Support:** Settings to enable UUID-based inventories alongside methods for plugins to transition to UUID-based systems similar to modern Minecraft server implementations.
@@ -34,13 +38,13 @@ Discord (Project Poseidon): https://discord.gg/FwKg676
 ## Want to use UberBukkit on your server?
 Please read the following article before changing over to UberBukkit (From Project-Poseidon): https://github.com/RhysB/Project-Poseidon/wiki/Implementing-Project-Poseidon-In-Production
 
-# Download
-## Releases
-You can download the latest GitHub release [here](https://github.com/Moresteck/Project-Poseidon-Uberbukkit/releases/latest)
+## Download
+### Releases
+You can download the latest GitHub release [here](https://github.com/Moresteck/Project-Poseidon-Uberbukkit/releases/latest).
 
-## Snapshots
-You can download the latest build through [GitHub actions](https://github.com/Moresteck/Project-Poseidon-Uberbukkit/actions/workflows/build-and-test.yaml) (You need to be logged into GitHub)
-or get it from [betacraft.uk](https://betacraft.uk/utilities) along with pre-made configuration files.
+### Snapshots
+You can download the latest build through [GitHub actions](https://github.com/Moresteck/Project-Poseidon-Uberbukkit/actions/workflows/build-and-test.yaml) (You need to be logged in on GitHub) <br>
+or get it from [betacraft.uk](https://betacraft.uk/utilities) along with **pre-made configuration files**.
 
 ## Licensing
 CraftBukkit and Bukkit are licensed under GNU General Public License v3.0<br>

diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
@@ -10,9 +10,6 @@
 
 import java.util.*;
 
-// CraftBukkit start
-// CraftBukkit end
-
 public class Explosion {
     public boolean setFire = false;
     private final Random random = new Random();
@@ -169,13 +166,9 @@ public void a() {
 
         this.size = f;
 
-<<<<<<< HEAD
         ArrayList<ChunkPosition> arraylist = new ArrayList<>();
         arraylist.addAll(this.blocks);
 
-=======
-        ArrayList<ChunkPosition> arraylist = new ArrayList<>(this.blocks);
->>>>>>> 3dcd51c5d10e12e825a949b1894fbfac23c7b526
         if (this.setFire) {
             for (int l2 = arraylist.size() - 1; l2 >= 0; --l2) {
                 ChunkPosition chunkposition = arraylist.get(l2);
@@ -218,11 +211,7 @@ public void a(boolean flag) {
         List<org.bukkit.block.Block> blockList = new ArrayList<>();
         for (int j = blocksCopy.size() - 1; j >= 0; j--) {
             ChunkPosition cpos = blocksCopy.get(j);
-<<<<<<< HEAD
-            // No need to handle blocks that aren't in the world's boundaries
-=======
             // UberBukkit - No need to handle blocks that aren't in the world's boundaries
->>>>>>> 3dcd51c5d10e12e825a949b1894fbfac23c7b526
             if (cpos.y > 127 || cpos.y < 0) {
                 blocksCopy.remove(j);
                 continue;

diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -335,17 +335,16 @@ public boolean isLiquid() {
 
     public PistonMoveReaction getPistonMoveReaction() {
         return PistonMoveReaction.getById(net.minecraft.server.Block.byId[this.getTypeId()].material.j());
-
     }
 
     @Override
     public Collection<ItemStack> getDrops() {
         net.minecraft.server.Block block = net.minecraft.server.Block.byId[getTypeId()];
         if (block == null) {
             return new ArrayList<ItemStack>();
-        }else if(block.material.i()) {
+        } else if(block.material.i()) {
             return Arrays.asList(block.getDrops(((CraftWorld) this.getWorld()).getHandle(), x, y, z, (int)getData()).map((list) -> list.stream().map(itemStack -> new CraftItemStack(itemStack)).toArray(ItemStack[]::new)).orElse(new ItemStack[0]));
-        }else {
+        } else {
             return new ArrayList<ItemStack>();
         }
     }
@@ -355,9 +354,9 @@ public Collection<ItemStack> getDrops(ItemStack tool) {
         net.minecraft.server.Block block = net.minecraft.server.Block.byId[getTypeId()];
         if (block == null) {
             return new ArrayList<ItemStack>();
-        }else if(block.material.i() || ((CraftItemStack)tool).getHandle().b(block)) {
+        } else if (block.material.i() || ((CraftItemStack) tool).getHandle().b(block)) {
             return Arrays.asList(block.getDrops(((CraftWorld) this.getWorld()).getHandle(), x, y, z, (int)getData()).map((list) -> list.stream().map(itemStack -> new CraftItemStack(itemStack)).toArray(ItemStack[]::new)).orElse(new ItemStack[0]));
-        }else {
+        } else {
             return new ArrayList<ItemStack>();
         }
     }
@@ -372,7 +371,7 @@ public boolean breakNaturally(ItemStack tool) {
         net.minecraft.server.Block block = net.minecraft.server.Block.byId[getTypeId()];
         if (block == null) {
             return false;
-        }else{
+        } else {
             Collection<ItemStack> drops = getDrops(tool);
             boolean flag = setTypeId(0);
             if (flag) {