Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix static access issues.

  • Loading branch information...
commit aeaad41c452ef30fe1e9f691e8bd6de655d2dce1 1 parent 15cdf3b
@gmcferrin gmcferrin authored
View
8 src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -183,8 +183,8 @@ public void onEntityDeath(EntityDeathEvent event) {
entity.setFireTicks(0);
BleedTimer.remove(entity);
Archery.arrowRetrievalCheck(entity);
- mcMMO.p.placeStore.removeSpawnedMob(((Entity) entity));
- mcMMO.p.placeStore.removeSpawnedPet(((Entity) entity));
+ mcMMO.placeStore.removeSpawnedMob(((Entity) entity));
+ mcMMO.placeStore.removeSpawnedPet(((Entity) entity));
}
/**
@@ -197,7 +197,7 @@ public void onCreatureSpawn(CreatureSpawnEvent event) {
SpawnReason reason = event.getSpawnReason();
if ((reason.equals(SpawnReason.SPAWNER) || reason.equals(SpawnReason.SPAWNER_EGG)) && !Config.getInstance().getExperienceGainsMobspawnersEnabled()) {
- mcMMO.p.placeStore.addSpawnedMob(((Entity) event.getEntity()));
+ mcMMO.placeStore.addSpawnedMob(((Entity) event.getEntity()));
}
}
@@ -398,7 +398,7 @@ public void onEntityTame(EntityTameEvent event) {
if(player.hasMetadata("NPC")) return; // Check if this player is a Citizens NPC
- if (Permissions.getInstance().taming(player) && !mcMMO.p.placeStore.isSpawnedPet((Entity) event.getEntity())) {
+ if (Permissions.getInstance().taming(player) && !mcMMO.placeStore.isSpawnedPet((Entity) event.getEntity())) {
PlayerProfile profile = Users.getProfile(player);
EntityType type = event.getEntityType();
int xp = 0;
View
2  src/main/java/com/gmail/nossr50/listeners/WorldListener.java
@@ -51,6 +51,6 @@ public void onChunkUnload(ChunkUnloadEvent event) {
@EventHandler
public void onChunkLoad(ChunkLoadEvent event) {
if(event.getChunk().getEntities().length > 0)
- mcMMO.p.placeStore.loadChunk(event.getChunk().getX(), event.getChunk().getZ(), event.getWorld());
+ mcMMO.placeStore.loadChunk(event.getChunk().getX(), event.getChunk().getZ(), event.getWorld());
}
}
View
2  src/main/java/com/gmail/nossr50/skills/taming/CallOfTheWildEventHandler.java
@@ -67,7 +67,7 @@ protected void spawnCreature() {
return;
LivingEntity entity = (LivingEntity) player.getWorld().spawnEntity(player.getLocation(), type);
- mcMMO.p.placeStore.addSpawnedPet((Entity) entity);
+ mcMMO.placeStore.addSpawnedPet((Entity) entity);
((Tameable) entity).setOwner(player);
View
4 src/main/java/com/gmail/nossr50/util/Combat.java
@@ -399,8 +399,8 @@ public static void startGainXp(Player attacker, PlayerProfile profile, LivingEnt
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 {

0 comments on commit aeaad41

Please sign in to comment.
Something went wrong with that request. Please try again.