Skip to content

Commit ef0ec60

Browse files
authored
Merge pull request #9 from JavaJava19/develop
Develop
2 parents eaa1d41 + 62501ac commit ef0ec60

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

src/main/java/com/github/elic0de/thejpspit/database/SqLiteDatabase.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,17 @@ public void updateUserData(PitPlayer player) {
247247
try (PreparedStatement statement = getConnection().prepareStatement(
248248
formatStatementTables("""
249249
UPDATE `%players_table%`
250-
SET `kills`=?, `streaks`=?, `deaths`=?, `rating`=?, `xp`=?
250+
SET `kills`=?, `streaks`=?, `bestStreaks`=?, `deaths`=?, `rating`=?, `bestRating`=?, `xp`=?
251251
WHERE `uuid`=?"""))) {
252252

253253
statement.setLong(1, player.getKills());
254254
statement.setLong(2, player.getStreaks());
255-
statement.setLong(3, player.getDeaths());
256-
statement.setDouble(4, player.getRating());
257-
statement.setDouble(5, player.getXp());
258-
statement.setString(6, player.getUniqueId().toString());
255+
statement.setLong(3, player.getBestStreaks());
256+
statement.setLong(4, player.getDeaths());
257+
statement.setDouble(5, player.getRating());
258+
statement.setDouble(6, player.getBestRating());
259+
statement.setDouble(7, player.getXp());
260+
statement.setString(8, player.getUniqueId().toString());
259261
statement.executeUpdate();
260262
}
261263

src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,15 @@
3030
import org.bukkit.event.player.PlayerDropItemEvent;
3131
import org.bukkit.event.player.PlayerExpChangeEvent;
3232
import org.bukkit.event.player.PlayerInteractEvent;
33+
import org.bukkit.event.player.PlayerItemConsumeEvent;
3334
import org.bukkit.event.player.PlayerItemDamageEvent;
3435
import org.bukkit.event.player.PlayerJoinEvent;
3536
import org.bukkit.event.player.PlayerQuitEvent;
3637
import org.bukkit.inventory.EquipmentSlot;
3738
import org.bukkit.metadata.FixedMetadataValue;
3839
import org.bukkit.metadata.MetadataValue;
40+
import org.bukkit.potion.PotionEffect;
41+
import org.bukkit.potion.PotionEffectType;
3942

4043
public class EventListener implements Listener {
4144

@@ -143,6 +146,15 @@ public void onDeath(EntityDeathEvent event) {
143146
event.setDroppedExp(0);
144147
}
145148

149+
@EventHandler
150+
public void onConsume(PlayerItemConsumeEvent event) {
151+
final Player player = event.getPlayer();
152+
153+
if (event.getItem().getType() == Material.GOLD_BLOCK)
154+
player.addPotionEffect(new PotionEffect(PotionEffectType.REGENERATION, 5 * 20, 2));
155+
player.addPotionEffect(new PotionEffect(PotionEffectType.ABSORPTION, 20 * 60 * 2, 0));
156+
}
157+
146158

147159
@EventHandler
148160
public void onHungerChange(FoodLevelChangeEvent event) {

src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void increaseXP() {
221221

222222
public void increaseHealth() {
223223
player.setHealth(Math.min(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(),
224-
player.getHealth() + 1));
224+
player.getHealth() + 2));
225225
}
226226

227227
public void resetStreaks() {

0 commit comments

Comments
 (0)