EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixing merge conflicts

Browse Source
This commit is contained in:
Glitchfinder
2013-01-06 17:59:31 -08:00
parent 974862a60a d0c051a9c2
commit 83888f80d4
30 changed files with 191 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -398,8 +398,8 @@ public class Combat {
baseXP = 20 * configInstance.getPlayerVersusPlayerXP();
}
}
else if (!mcMMO.p.placeStore.isSpawnedMob(((Entity) target))) {
if (target instanceof Animals && !mcMMO.p.placeStore.isSpawnedPet((Entity) target)) {
else if (!mcMMO.placeStore.isSpawnedMob(((Entity) target))) {
if (target instanceof Animals && !mcMMO.placeStore.isSpawnedPet((Entity) target)) {
baseXP = configInstance.getAnimalsXP();
}
else {

1
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@ -19,7 +19,6 @@ import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.ChunkletUnloader;
import com.gmail.nossr50.runnables.blockstoreconversion.BlockStoreConversionZDirectory;

9
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java
View File

@ -22,8 +22,8 @@ public class PrimitiveChunkStore implements ChunkStore {
private int cx;
private int cz;
private UUID worldUid;
private List spawnedMobs = new ArrayList<UUID>();
private List spawnedPets = new ArrayList<UUID>();
private List<UUID> spawnedMobs = new ArrayList<UUID>();
private List<UUID> spawnedPets = new ArrayList<UUID>();
transient private int worldHeight;
transient private int xBitShifts;
transient private int zBitShifts;
@ -214,8 +214,9 @@ public class PrimitiveChunkStore implements ChunkStore {
}
if(fileVersionNumber >= 6) {
spawnedMobs = (ArrayList) in.readObject();
spawnedPets = (ArrayList) in.readObject();
//What do we want to do about this? These casts are unchecked.
spawnedMobs = (ArrayList<UUID>) in.readObject();
spawnedPets = (ArrayList<UUID>) in.readObject();
}
}